diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-07-15 23:17:57 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-07-15 23:17:57 -0700 |
| commit | 3602fd7a36d963311339ab11ed36ff00df860f71 (patch) | |
| tree | 5834a98b35c02639c876544bc645f205068fac99 /tox.ini | |
| parent | a3c7c84d49c3e6563e7f37ef60c989f99ed96788 (diff) | |
| parent | 17305643bc482c0b185eec5c64d506790cd26587 (diff) | |
| download | mitmproxy-3602fd7a36d963311339ab11ed36ff00df860f71.tar.gz mitmproxy-3602fd7a36d963311339ab11ed36ff00df860f71.tar.bz2 mitmproxy-3602fd7a36d963311339ab11ed36ff00df860f71.zip | |
Merge remote-tracking branch 'origin/master' into message-body-encoding
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 18 |
1 files changed, 4 insertions, 14 deletions
@@ -1,31 +1,21 @@ [tox] envlist = py27, py35, docs, lint +skipsdist = True [testenv] -usedevelop = True deps = {env:CI_DEPS:} -rrequirements.txt passenv = CODECOV_TOKEN CI CI_* TRAVIS TRAVIS_* APPVEYOR APPVEYOR_* -setenv = - TESTS = test/ - HOME = {envtmpdir} +setenv = HOME = {envtmpdir} commands = - py.test --timeout 60 {posargs} {env:TESTS} + py.test --timeout 60 {posargs} {env:CI_COMMANDS:python -c ""} -[testenv:py35] -setenv = - TESTS = test/netlib test/pathod/ test/mitmproxy/script test/mitmproxy/test_contentview.py test/mitmproxy/test_custom_contentview.py test/mitmproxy/test_app.py test/mitmproxy/test_controller.py test/mitmproxy/test_fuzzing.py test/mitmproxy/test_script.py test/mitmproxy/test_web_app.py test/mitmproxy/test_utils.py test/mitmproxy/test_stateobject.py test/mitmproxy/test_cmdline.py test/mitmproxy/test_contrib_tnetstring.py test/mitmproxy/test_proxy.py test/mitmproxy/test_protocol_http1.py test/mitmproxy/test_platform_pf.py test/mitmproxy/test_server.py test/mitmproxy/test_filt.py - HOME = {envtmpdir} - [testenv:docs] changedir = docs -commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html +commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html [testenv:lint] deps = flake8>=2.6.2, <3 -usedevelop = False -skip_install = True -skipsdist = True commands = flake8 --jobs 8 --count mitmproxy netlib pathod examples test |