aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.appveyor.yml2
-rw-r--r--.travis.yml2
-rw-r--r--setup.cfg2
3 files changed, 3 insertions, 3 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index a0eadb4e..2e1a477f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -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:
diff --git a/.travis.yml b/.travis.yml
index 6bc4ddf3..7d3fbee8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/setup.cfg b/setup.cfg
index 7849ca07..d51ddc14 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,7 +9,7 @@ ignore = E251
[pytest]
testpaths = test
-addopts = --timeout 60 --capture=no
+addopts = --capture=no
[coverage:run]
branch = True