disable py.test timeout by default, this breaks interactive debuggers

This commit is contained in:
Maximilian Hils 2016-05-02 16:51:49 -07:00
parent b5e5917f7f
commit 714ba16111
3 changed files with 3 additions and 3 deletions

View File

@ -17,7 +17,7 @@ install:
- "dev.bat"
- "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\""
test_script:
- "py.test --cov netlib --cov mitmproxy --cov pathod"
- "py.test --timeout 60 --cov netlib --cov mitmproxy --cov pathod"
cache:
- C:\Users\appveyor\AppData\Local\pip\cache
deploy_script:

View File

@ -48,7 +48,7 @@ before_script:
- "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\""
script:
- "py.test --cov netlib --cov mitmproxy --cov pathod ./test/$SCOPE"
- "py.test --timeout 60 --cov netlib --cov mitmproxy --cov pathod ./test/$SCOPE"
after_success:
- coveralls

View File

@ -9,7 +9,7 @@ ignore = E251
[pytest]
testpaths = test
addopts = --timeout 60 --capture=no
addopts = --capture=no
[coverage:run]
branch = True