diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-05-02 16:51:49 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-05-02 16:51:49 -0700 |
| commit | 714ba1611125601e4eb21a2ceb5fa7f742d008b9 (patch) | |
| tree | 4a299954ff708965f5e8b3eb88f10da8ccff4b14 | |
| parent | b5e5917f7f30ecce6939477c7a54a9b582b6b2c7 (diff) | |
| download | mitmproxy-714ba1611125601e4eb21a2ceb5fa7f742d008b9.tar.gz mitmproxy-714ba1611125601e4eb21a2ceb5fa7f742d008b9.tar.bz2 mitmproxy-714ba1611125601e4eb21a2ceb5fa7f742d008b9.zip | |
disable py.test timeout by default, this breaks interactive debuggers
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | setup.cfg | 2 |
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 @@ -9,7 +9,7 @@ ignore = E251 [pytest] testpaths = test -addopts = --timeout 60 --capture=no +addopts = --capture=no [coverage:run] branch = True |