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 May 16, 2018
1 parent f456f4e commit ac68c96
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 @@ -66,6 +66,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]
per-file-ignores =
docs/source/conf.py: E121,E122,E265,E501
Expand Down

0 comments on commit ac68c96

Please sign in to comment.