aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-05-02 16:51:49 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-05-02 16:51:49 -0700
commit714ba1611125601e4eb21a2ceb5fa7f742d008b9 (patch)
tree4a299954ff708965f5e8b3eb88f10da8ccff4b14 /.travis.yml
parentb5e5917f7f30ecce6939477c7a54a9b582b6b2c7 (diff)
downloadmitmproxy-714ba1611125601e4eb21a2ceb5fa7f742d008b9.tar.gz
mitmproxy-714ba1611125601e4eb21a2ceb5fa7f742d008b9.tar.bz2
mitmproxy-714ba1611125601e4eb21a2ceb5fa7f742d008b9.zip
disable py.test timeout by default, this breaks interactive debuggers
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
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