aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-05-31 10:25:24 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-05-31 10:25:24 +1200
commitd98582664d8f234fe6a2c805f02d47686243379f (patch)
tree4cd5f6200caa6daefbc11be96b724ef97ba39b4d
parentbc6509ab6d5152533504545b26e55f1eb8e41add (diff)
downloadmitmproxy-d98582664d8f234fe6a2c805f02d47686243379f.tar.gz
mitmproxy-d98582664d8f234fe6a2c805f02d47686243379f.tar.bz2
mitmproxy-d98582664d8f234fe6a2c805f02d47686243379f.zip
Make tox run all tests for 2.7
-rw-r--r--tox.ini5
1 files changed, 5 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 38cf94a6..08542426 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,6 +3,11 @@ envlist = py27, py35, lint
[testenv]
deps = -rrequirements.txt
+
+[testenv:py27]
+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
[testenv:lint]