Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 18:18:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1238 from cortesi/toxfiddle

Browse Source 
Distinguish between CI and interactive versions of tox
This commit is contained in:
Aldo Cortesi 2016-06-11 16:24:12 +12:00 committed by GitHub
commit 4831e3e0bc
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -14,15 +14,15 @@ matrix:
fast_finish: true fast_finish: true
include: include:
- python: 2.7 - python: 2.7
env: TOXENV=py27 env: TOXENV=py27-ci
- python: 2.7 - python: 2.7
env: TOXENV=py27 NO_ALPN=1 env: TOXENV=py27-ci NO_ALPN=1
- python: 3.5 - python: 3.5
env: TOXENV=py35 env: TOXENV=py35-ci
- python: 3.5 - python: 3.5
env: TOXENV=py35 NO_ALPN=1 env: TOXENV=py35-ci NO_ALPN=1
- language: generic - language: generic
env: TOXENV=py27 env: TOXENV=py27-ci
os: osx os: osx
osx_image: xcode7.1 osx_image: xcode7.1
git: git:
@ -40,9 +40,9 @@ install:
brew outdated openssl || brew upgrade openssl brew outdated openssl || brew upgrade openssl
brew install python brew install python
fi fi
- pip install tox
before_script: before_script:
- "pip install tox"
- "tox -e lint" - "tox -e lint"
script: tox script: tox

18
tox.ini
View File

@ -6,17 +6,29 @@ deps =
-rrequirements.txt -rrequirements.txt
codecov>=2.0.5 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 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] [testenv:py27]
commands = commands =
py.test --cov netlib --cov mitmproxy --cov pathod --color=yes --timeout 60 ./test py.test -n 8 --color=yes --timeout 60 []
codecov -e TOXENV
[testenv:py35] [testenv:py35]
# remove bash & pipe & grep hack after cryptography ships with openssl 1.1.0 # remove bash & pipe & grep hack after cryptography ships with openssl 1.1.0
whitelist_externals = bash whitelist_externals = bash
commands = 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 -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-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 {env:PY3TESTS:} 2>&1 | grep -v Cryptography_locking_cb'
codecov -e TOXENV codecov -e TOXENV
[testenv:docs] [testenv:docs]