diff options
| author | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2016-03-20 20:40:15 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2016-03-20 20:40:15 +0100 |
| commit | d8e8dfc1c6136c709bb3286c2f058a8ac101acc0 (patch) | |
| tree | 674c8bce55f54b904287763f2745c5ec3f783829 | |
| parent | 6f902ffbb3067350da3da01d923e4351d63f604a (diff) | |
| parent | 43671e723ff9cc783b21d447b448d661ce28734a (diff) | |
| download | mitmproxy-d8e8dfc1c6136c709bb3286c2f058a8ac101acc0.tar.gz mitmproxy-d8e8dfc1c6136c709bb3286c2f058a8ac101acc0.tar.bz2 mitmproxy-d8e8dfc1c6136c709bb3286c2f058a8ac101acc0.zip | |
Merge pull request #1047 from mitmproxy/no-coverage-by-default
py.test: disable coverage collection by default
| -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 805be7e7..75cf6e0a 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" + - "py.test --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 d0e5e62d..113fda09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ before_script: - "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\"" script: - - "py.test ./test/$SCOPE" + - "py.test --cov netlib --cov mitmproxy --cov pathod ./test/$SCOPE" after_success: - coveralls @@ -9,7 +9,7 @@ ignore = E251 [pytest] testpaths = test -addopts = --timeout 30 -s --cov netlib --cov mitmproxy --cov pathod +addopts = --timeout 30 -s [coverage:run] branch = True |