diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-06-11 16:24:12 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 16:24:12 +1200 |
| commit | 4831e3e0bcd6dc94c84df3dd224c354732bd3655 (patch) | |
| tree | dd1b458e77d79a8f7867e31f7a352c19e586e129 | |
| parent | 0b241a1da71ef9eb7632fc0e32abcf061dcbd217 (diff) | |
| parent | 227d762cace09bc315e57644da2135480bf32cb9 (diff) | |
| download | mitmproxy-4831e3e0bcd6dc94c84df3dd224c354732bd3655.tar.gz mitmproxy-4831e3e0bcd6dc94c84df3dd224c354732bd3655.tar.bz2 mitmproxy-4831e3e0bcd6dc94c84df3dd224c354732bd3655.zip | |
Merge pull request #1238 from cortesi/toxfiddle
Distinguish between CI and interactive versions of tox
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | tox.ini | 16 |
2 files changed, 20 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index b0a4ea10..a01bf055 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,15 +14,15 @@ matrix: fast_finish: true include: - python: 2.7 - env: TOXENV=py27 + env: TOXENV=py27-ci - python: 2.7 - env: TOXENV=py27 NO_ALPN=1 + env: TOXENV=py27-ci NO_ALPN=1 - python: 3.5 - env: TOXENV=py35 + env: TOXENV=py35-ci - python: 3.5 - env: TOXENV=py35 NO_ALPN=1 + env: TOXENV=py35-ci NO_ALPN=1 - language: generic - env: TOXENV=py27 + env: TOXENV=py27-ci os: osx osx_image: xcode7.1 git: @@ -40,9 +40,9 @@ install: brew outdated openssl || brew upgrade openssl brew install python fi + - pip install tox before_script: - - "pip install tox" - "tox -e lint" script: tox @@ -6,17 +6,29 @@ deps = -rrequirements.txt codecov>=2.0.5 passenv = CI TRAVIS_BUILD_ID TRAVIS TRAVIS_BRANCH TRAVIS_JOB_NUMBER TRAVIS_PULL_REQUEST TRAVIS_JOB_ID TRAVIS_REPO_SLUG TRAVIS_COMMIT +setenv = + PY3TESTS = test/netlib test/mitmproxy/script test/pathod/test_utils.py test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_writer.py test/pathod/test_language_base.py test/pathod/test_language_http.py test/pathod/test_language_websocket.py test/pathod/test_language_http2.py [testenv:py27] commands = + py.test -n 8 --color=yes --timeout 60 [] + +[testenv:py35] +# remove bash & pipe & grep hack after cryptography ships with openssl 1.1.0 +whitelist_externals = bash +commands = + bash -c 'set -o pipefail ; py.test -n 8 --color=yes --timeout 60 {env:PY3TESTS:} 2>&1 | grep -v Cryptography_locking_cb' + +[testenv:py27-ci] +commands = py.test --cov netlib --cov mitmproxy --cov pathod --color=yes --timeout 60 ./test codecov -e TOXENV -[testenv:py35] +[testenv:py35-ci] # remove bash & pipe & grep hack after cryptography ships with openssl 1.1.0 whitelist_externals = bash commands = - bash -c 'set -o pipefail ; py.test --cov netlib --cov mitmproxy --cov pathod --color=yes --timeout 60 test/netlib test/mitmproxy/script test/pathod/test_utils.py test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_writer.py test/pathod/test_language_base.py test/pathod/test_language_http.py test/pathod/test_language_websocket.py test/pathod/test_language_http2.py 2>&1 | grep -v Cryptography_locking_cb' + bash -c 'set -o pipefail ; py.test --cov netlib --cov mitmproxy --cov pathod --color=yes --timeout 60 {env:PY3TESTS:} 2>&1 | grep -v Cryptography_locking_cb' codecov -e TOXENV [testenv:docs] |