Merge from 5.x: PR #17137

spyder-ide · Jan 4, 2022 · cd85711 · cd85711
2 parents 700505f + 3aebe7f
commit cd85711
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/test-files.yml b/.github/workflows/test-files.yml
@@ -42,6 +42,7 @@ jobs:
       fail-fast: false
       matrix:
         PYTHON_VERSION: ['3.7']
+    timeout-minutes: 30
     steps:
       - name: Checkout Pull Requests
         if: github.event_name == 'pull_request'

diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -46,7 +46,7 @@ jobs:
         INSTALL_TYPE: ['conda', 'pip']
         PYTHON_VERSION: ['3.7']
         TEST_TYPE: ['fast', 'slow']
-
+    timeout-minutes: 120
     steps:
       - name: Checkout Pull Requests
         if: github.event_name == 'pull_request'

diff --git a/.github/workflows/test-mac.yml b/.github/workflows/test-mac.yml
@@ -46,6 +46,7 @@ jobs:
         INSTALL_TYPE: ['conda']
         PYTHON_VERSION: ['3.7']
         TEST_TYPE: ['fast', 'slow']
+    timeout-minutes: 120
     steps:
       - name: Checkout Pull Requests
         if: github.event_name == 'pull_request'

diff --git a/.github/workflows/test-win.yml b/.github/workflows/test-win.yml
@@ -46,6 +46,7 @@ jobs:
         INSTALL_TYPE: ['conda']
         PYTHON_VERSION: ['3.7']
         TEST_TYPE: ['fast', 'slow']
+    timeout-minutes: 120
     steps:
       - name: Checkout Pull Requests
         if: github.event_name == 'pull_request'

diff --git a/spyder/app/tests/test_mainwindow.py b/spyder/app/tests/test_mainwindow.py
@@ -4430,6 +4430,7 @@ def test_focus_to_consoles(main_window, qtbot):
 
 @pytest.mark.slow
 @flaky(max_runs=3)
+@pytest.mark.skipif(os.name == 'nt', reason="Hangs sometimes on Windows")
 def test_rename_files_in_editor_after_folder_rename(main_window, mocker,
                                                     tmpdir):
     """