aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2016-02-01 23:10:40 +0100
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-02-04 09:52:28 +0100
commitab3543ba4d66f5ffadf0873a7fd384e2ddf8336f (patch)
treedf4516a4d294c38a82a496313f9568ce94275553 /.travis.yml
parentd8ae7c3e29bcf117eb051f9e74b76fea733c1c64 (diff)
downloadmitmproxy-ab3543ba4d66f5ffadf0873a7fd384e2ddf8336f.tar.gz
mitmproxy-ab3543ba4d66f5ffadf0873a7fd384e2ddf8336f.tar.bz2
mitmproxy-ab3543ba4d66f5ffadf0873a7fd384e2ddf8336f.zip
use test timeouts
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 2545899c..be78031d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,7 @@ before_script:
- "openssl version -a"
script:
- - "py.test -s --cov libmproxy"
+ - "py.test -s --cov libmproxy --timeout 30"
after_success:
- coveralls