Merge branch 'tox' of https://github.com/Kriechi/mitmproxy into Kriechi-tox

This commit is contained in:
Aldo Cortesi 2016-05-30 12:20:46 +12:00
commit 6ecc6da486
3 changed files with 13 additions and 0 deletions

1
.gitignore vendored
View File

@ -18,3 +18,4 @@ node_modules
bower_components bower_components
*.map *.map
sslkeylogfile.log sslkeylogfile.log
.tox/

2
.python-version Normal file
View File

@ -0,0 +1,2 @@
2.7.11
3.5.1

10
tox.ini Normal file
View File

@ -0,0 +1,10 @@
[tox]
envlist = py27, py35, lint
[testenv]
deps = -rrequirements.txt
commands = py.test -n 8 --timeout 60 ./test/netlib ./test/mitmproxy/script ./test/pathod/test_utils.py ./test/pathod/test_log.py
[testenv:lint]
deps = flake8
commands = flake8 --exit-zero --count mitmproxy netlib pathod examples test