diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2016-06-07 12:56:51 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2016-06-07 12:56:51 +1200 |
commit | 75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34 (patch) | |
tree | 9bff77b84d485549f2d9cfad61a4c54b6315088d /tox.ini | |
parent | e037fe05ff1f0c2893b3f51e06e0261ca4245d63 (diff) | |
parent | 80292c0ac3c9684ee945546c9b45334178518e4e (diff) | |
download | mitmproxy-75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34.tar.gz mitmproxy-75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34.tar.bz2 mitmproxy-75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -8,7 +8,7 @@ deps = -rrequirements.txt commands = py.test -n 8 --timeout 60 ./test [testenv:py35] -commands = py.test -n 8 --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 +commands = py.test -n 8 --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 [testenv:lint] deps = flake8 |