summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2013-08-06 07:47:01 +0200
committerholger krekel <holger@merlinux.eu>2013-08-06 07:47:01 +0200
commit51b05d96c8205f5e69a8f14d271932aadfdc2207 (patch)
treedb67eecd1f77e2629212ac57585c131d6e8daa97 /tox.ini
parentafad7a309c3dc9ab947425da44caaeca584a4b46 (diff)
downloadtox-51b05d96c8205f5e69a8f14d271932aadfdc2207.tar.gz
introduce --reportjson=PATH option to write out test run information (version 1).
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini9
1 files changed, 4 insertions, 5 deletions
diff --git a/tox.ini b/tox.ini
index 81cbfa0..bfc2634 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +1,14 @@
[tox]
-envlist=py27,py26,py25,py32,py33,docs,pypy
+envlist=py27,py26,py32,py33,docs,pypy
[testenv:X]
commands=echo {posargs}
[testenv]
-commands=py.test --instafail --junitxml={envlogdir}/junit-{envname}.xml {posargs}
-deps=pytest==2.3.4
- pytest-instafail
+commands=py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs}
+deps=pytest>=2.3.5
-[testenv:py25]
+[testenv:py25] # requires virtualenv-1.9.1
setenvs =
PIP_INSECURE=True