aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-06-28 23:18:55 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-06-28 23:18:55 -0700
commit7cae0c268f728a6dafede4cc04fabdad1f3e5c52 (patch)
tree2e5891be6f1cdb8aa90dc2273b20b831a98216cc /tox.ini
parenta57ea27bd471f7c3b96e321db337531e5a30d7fe (diff)
downloadmitmproxy-7cae0c268f728a6dafede4cc04fabdad1f3e5c52.tar.gz
mitmproxy-7cae0c268f728a6dafede4cc04fabdad1f3e5c52.tar.bz2
mitmproxy-7cae0c268f728a6dafede4cc04fabdad1f3e5c52.zip
do not run tests in parallel
this makes ci very unreliable, see https://travis-ci.org/mitmproxy/mitmproxy/jobs/140994186 I don't know of a way to fix the test collection bug.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index b39d786c..6e3f570f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ setenv =
TESTS = test/
HOME = {envtmpdir}
commands =
- py.test -n 4 --timeout 60 {posargs} {env:TESTS}
+ py.test --timeout 60 {posargs} {env:TESTS}
{env:CI_COMMANDS:python -c ""}
[testenv:py35]