diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-06-10 16:03:54 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-06-10 16:03:54 +1200 |
| commit | bac3e87538d5398eb637fb26560705886c4fcfd1 (patch) | |
| tree | ef752b46fa6a3ff2c9f8e924b53caab1e54168ec | |
| parent | 11fb21719179f243b9f2a069cba42c1d7f3722c0 (diff) | |
| download | mitmproxy-bac3e87538d5398eb637fb26560705886c4fcfd1.tar.gz mitmproxy-bac3e87538d5398eb637fb26560705886c4fcfd1.tar.bz2 mitmproxy-bac3e87538d5398eb637fb26560705886c4fcfd1.zip | |
Distinguish between CI and interactive versions of tox
- This patch changes tox so that local invocation runs the tests
with paralellism, coverage disabled, and without attempting to report coverage
upstream.
- You can now run specific tests for the py27 environment:
tox -e py27 ./path/to/my/test
We can't do this for py35 just yet, because of our junk filter, and the fact
that we specify which tests to run directly in the conf file. Once these are
cleaned up, we can extend.
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | tox.ini | 14 |
2 files changed, 19 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index b0a4ea10..3c48eb39 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 tox-travis before_script: - - "pip install tox" - "tox -e lint" script: tox @@ -9,11 +9,23 @@ passenv = CI TRAVIS_BUILD_ID TRAVIS TRAVIS_BRANCH TRAVIS_JOB_NUMBER TRAVIS_PULL_ [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 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' + +[testenv:py27-ci] +basepython = python2.7 +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 +basepython = python3.5 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' |