rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Add pytest-timeout."

Browse Source 
This reverts commit 8919a152fe.

Seems to cause more trouble than it's worth... bogus timeouts on OS X and
Windows, with Windows then hanging...
This commit is contained in:
Florian Bruhin 2015-10-26 08:53:55 +01:00
parent 0cdc744afd
commit c335aff900
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pytest.ini
View File

@ -33,4 +33,3 @@ 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

1
tox.ini
View File

@ -24,7 +24,6 @@ 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