fix up tests to generate coverage reports always and combine at the end

1 files changed, 15 insertions, 12 deletions

diff --git a/tox.ini b/tox.ini
index ba0007d7a..dae31ddd6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,24 +1,27 @@
 [tox]
+skipsdist = True
 envlist = 
-    clean,py26,py27,py32,py33,py34,pypy,pypy3,report
-
-[testenv:clean]
-commands = coverage erase
-deps = coverage
+    py26,py27,py32,py33,py34,pypy,pypy3,cover
 
 [testenv]
 commands = 
-    python setup.py dev
-    python setup.py nosetests --with-coverage
+    {envbindir}/python setup.py dev
+    {envbindir}/coverage run --source={toxinidir}/pyramid {envbindir}/nosetests --xunit-file=nosetests-{envname}.xml
+    {envbindir}/coverage xml -o coverage-{envname}.xml
+setenv =
+    COVERAGE_FILE=.coverage.{envname}
 
-[testenv:report]
+[testenv:cover]
 commands = 
-    python setup.py dev
-    python setup.py nosetests --with-xunit --with-xcoverage --cover-min-percentage=100
+    {envbindir}/coverage erase
+    {envbindir}/coverage combine
+    {envbindir}/coverage xml
+    {envbindir}/coverage report --show-missing --fail-under=100
 deps =
-    nosexcover
+    coverage
+setenv =
+    COVERAGE_FILE=.coverage
 
 # 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.
-