Add pytest-timeout.

2015-10-26 07:33:32 +01:00 · 2015-10-26 07:33:32 +01:00 · 8919a152fe
commit 8919a152fe
parent 8dc5c95cef
2 changed files with 2 additions and 0 deletions
--- a/pytest.ini
+++ b/pytest.ini
@ -33,3 +33,4 @@ qt_log_ignore =
    ^virtual void QSslSocketBackendPrivate::transmit\(\) SSL write failed with error: -9805
    ^virtual void QSslSocketBackendPrivate::transmit\(\) SSLRead failed with: -9805
    ^Type conversion already registered from type .*
+timeout = 25
--- a/tox.ini
+++ b/tox.ini
@ -24,6 +24,7 @@ deps =
    pytest-faulthandler==1.0.1
    pytest-sugar==0.5.1
    pytest-travis-fold==1.1.0
+    pytest-timeout==0.5
    xvfbwrapper==0.2.5
    hypothesis==1.12.0
    coverage==4.0.1