restore the old per-language coverage filesproxy-header-middleware

3 files changed, 13 insertions, 2 deletions

diff --git a/.coveragerc b/.coveragerc
index c2c3d96..cbacd63 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,6 +1,8 @@
 [run]
 parallel = true
-concurrency = thread,multiprocessing
+concurrency =
+    thread
+    multiprocessing
 source =
     waitress
 
diff --git a/.gitignore b/.gitignore
index e1dbc2a..3a33b6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.pyc
 env*/
 .coverage
+.coverage.*
 .idea/
 .tox/
 nosetests.xml
diff --git a/tox.ini b/tox.ini
index 4c42a11..61cc9e9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ envlist =
 
 [testenv]
 commands =
-    nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:}
+    nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:waitress}
 
 extras =
     testing
@@ -22,6 +22,8 @@ extras =
 [py-cover]
 commands =
     coverage run {envbindir}/nosetests waitress
+    coverage combine
+    coverage xml -o {envname}.xml
 
 extras =
     testing
@@ -30,10 +32,16 @@ extras =
 commands =
     {[py-cover]commands}
 
+setenv =
+    COVERAGE_FILE=.coverage.py2
+
 [testenv:py35-cover]
 commands =
     {[py-cover]commands}
 
+setenv =
+    COVERAGE_FILE=.coverage.py3
+
 [testenv:coverage]
 basepython = python3.5
 commands =