From 636cd14b98f4d763970a40a5d93cf441412d655f Mon Sep 17 00:00:00 2001 From: Sam Tygier Date: Wed, 25 Aug 2021 12:32:51 +0100 Subject: [PATCH] Don't run test_run_operation_stack_safe on github actions --- .github/workflows/conda.yml | 2 +- mantidimaging/gui/test/gui_system_base.py | 2 +- mantidimaging/gui/test/test_gui_system_loading.py | 2 +- mantidimaging/gui/test/test_gui_system_operations.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml index acc93d88dcd..0c18b84cde0 100644 --- a/.github/workflows/conda.yml +++ b/.github/workflows/conda.yml @@ -76,7 +76,7 @@ jobs: shell: bash -l {0} run: | xvfb-run --auto-servernum python -m pytest -vs -rs -p no:xdist -p no:randomly -p no:repeat -p no:cov --run-system-tests - timeout-minutes: 15 + timeout-minutes: 20 - name: GUI Tests Applitools if: ${{ github.event_name == 'pull_request' }} diff --git a/mantidimaging/gui/test/gui_system_base.py b/mantidimaging/gui/test/gui_system_base.py index 9e988abdfff..5f7b1daac2b 100644 --- a/mantidimaging/gui/test/gui_system_base.py +++ b/mantidimaging/gui/test/gui_system_base.py @@ -102,7 +102,7 @@ def test_func() -> bool: self.main_window.load_dialogue.presenter.notify(Notification.UPDATE_ALL_FIELDS) QTest.qWait(SHOW_DELAY) self.main_window.load_dialogue.accept() - self._wait_until(test_func) + self._wait_until(test_func, max_retry=600) def _open_operations(self): self.main_window.actionFilters.trigger() diff --git a/mantidimaging/gui/test/test_gui_system_loading.py b/mantidimaging/gui/test/test_gui_system_loading.py index ca89da38b54..3991dd7ce32 100644 --- a/mantidimaging/gui/test/test_gui_system_loading.py +++ b/mantidimaging/gui/test/test_gui_system_loading.py @@ -27,7 +27,7 @@ def test_func() -> bool: current_stacks = len(self.main_window.presenter.model.get_all_stack_visualisers()) return (current_stacks - initial_stacks) >= 1 - self._wait_until(test_func) + self._wait_until(test_func, max_retry=600) @classmethod def _click_stack_selector(cls): diff --git a/mantidimaging/gui/test/test_gui_system_operations.py b/mantidimaging/gui/test/test_gui_system_operations.py index 45c62214e64..8014999bcea 100644 --- a/mantidimaging/gui/test/test_gui_system_operations.py +++ b/mantidimaging/gui/test/test_gui_system_operations.py @@ -102,7 +102,7 @@ def test_run_operation_stack(self, op_name, params): self.op_window.safeApply.setChecked(False) QTest.mouseClick(self.op_window.applyButton, Qt.MouseButton.LeftButton) QTest.qWait(SHORT_DELAY) - self._wait_until(lambda: self.op_window.presenter.filter_is_running is False) + self._wait_until(lambda: self.op_window.presenter.filter_is_running is False, max_retry=600) self.main_window.filters.close() QTest.qWait(SHOW_DELAY)