diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-02-01 23:10:40 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-02-04 09:52:28 +0100 |
| commit | ab3543ba4d66f5ffadf0873a7fd384e2ddf8336f (patch) | |
| tree | df4516a4d294c38a82a496313f9568ce94275553 | |
| parent | d8ae7c3e29bcf117eb051f9e74b76fea733c1c64 (diff) | |
| download | mitmproxy-ab3543ba4d66f5ffadf0873a7fd384e2ddf8336f.tar.gz mitmproxy-ab3543ba4d66f5ffadf0873a7fd384e2ddf8336f.tar.bz2 mitmproxy-ab3543ba4d66f5ffadf0873a7fd384e2ddf8336f.zip | |
use test timeouts
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | setup.py | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 55aed6aa..689ad5e5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -11,7 +11,7 @@ install: - "pip install --user --src .. -r requirements.txt" - "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\"" test_script: - - "py.test -s --cov libmproxy" + - "py.test -s --cov libmproxy --timeout 30" cache: - C:\Users\appveyor\AppData\Local\pip\cache after_test: 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 @@ -46,6 +46,7 @@ dev_deps = { "pytest>=2.8.0", "pytest-xdist>=1.13.1", "pytest-cov>=2.1.0", + "pytest-timeout>=1.0.0", "coveralls>=0.4.1", "pathod>=%s, <%s" % (version.MINORVERSION, version.NEXT_MINORVERSION), "sphinx>=1.3.1", |