summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tox.ini40
1 files changed, 30 insertions, 10 deletions
diff --git a/tox.ini b/tox.ini
index d1c3c81a5..64ffe7121 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,16 +1,36 @@
[tox]
envlist =
- py24,py25,py26,py27,jython,pypy
+ py24,py25,py26,py27,jython,pypy,cover
+
[testenv]
commands =
- python setup.py nosetests --with-xunit --with-xcoverage
+ python setup.py test -q
+# if we ever want to run the paster template tests, we could also use:
# python template_tests.py
-deps = Sphinx
- WebTest
- repoze.sphinx.autointerface
- virtualenv
- nose
- coverage==3.3
- nosexcover
+# they take forever, though
+deps =
+ Sphinx
+ WebTest
+ repoze.sphinx.autointerface
+ virtualenv
+
+[testenv:cover]
+basepython =
+ python2.6
+commands =
+ python setup.py nosetests --with-xunit --with-xcoverage
+deps =
+ Sphinx
+ WebTest
+ repoze.sphinx.autointerface
+ virtualenv
+ nose
+ coverage<3.4
+ nosexcover
+
+
+# we separate coverage into its own testenv because a) "last run wins" wrt
+# cobertura jenkins reporting and b) pypy and jython can't handle any
+# combination of versions of coverage and nosexcover that i can find.
+# coverage <3.4 is required by nosexcover 1.0.4.
-# coverage <3.4 required by nosexcover