Skip to content

Commit

Permalink
Merge pull request #17990 from dalthviz/pytest-timeout
Browse files Browse the repository at this point in the history
PR: Use `pytest-timeout` and set timeout to 120 secs
  • Loading branch information
ccordoba12 authored Jul 2, 2022
2 parents 86c19b5 + 6633f6d commit 75f3fd8
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ dependencies:
- pytest-mock
- pytest-order
- pytest-qt
- pytest-timeout
- pyyaml
- scipy
- sympy
Expand Down
1 change: 1 addition & 0 deletions requirements/tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ pytest-lazy-fixture
pytest-mock
pytest-order
pytest-qt
pytest-timeout
pyyaml
scipy
sympy
2 changes: 1 addition & 1 deletion runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def run_pytest(run_slow=False, extra_args=None):
"""Run pytest tests for Spyder."""
# Be sure to ignore subrepos
pytest_args = ['-vv', '-rw', '--durations=10', '--ignore=./external-deps',
'-W ignore::UserWarning']
'-W ignore::UserWarning', '--timeout=120']

if CI:
# Exit on first failure and show coverage
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ def run(self):
'pytest-mock',
'pytest-order',
'pytest-qt',
'pytest-timeout',
'pyyaml',
'scipy',
'sympy',
Expand Down

0 comments on commit 75f3fd8

Please sign in to comment.