Skip to content

Commit

Permalink
Re-integrate pytest-timeout plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
Peque committed Apr 2, 2018
1 parent bcc4d0a commit aa14195
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
'pytest',
'pytest-cov',
'pytest-rerunfailures',
'pytest-timeout',
'pytest-xdist',
],
},
Expand Down
3 changes: 3 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ envlist =
lint
docs

[pytest]
timeout = 10

[flake8]
ignore =
__init__.py E402 F401
Expand Down

0 comments on commit aa14195

Please sign in to comment.