From 7cbcbcd3d36e0bde4a18e2073eaa0853a37fa1a4 Mon Sep 17 00:00:00 2001
From: meejah <meejah@meejah.ca>
Date: Tue, 15 Sep 2015 15:02:11 -0600
Subject: [PATCH] run tests with -p to get complete coverage

---
 Makefile | 7 ++++---
 tox.ini  | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 764913986..c57459a72 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ test_styleguide:
 
 # direct test via pytest (only here because of setuptools test integration)
 test_pytest:
-	python -m pytest -rsx .
+	python -m pytest -rsx autobahn/
 
 # test via setuptools command
 test_setuptools:
@@ -62,13 +62,14 @@ test_twisted_coverage:
 
 test_coverage:
 	-rm .coverage
-	tox -e py27twisted,py27asyncio,py34asyncio
+	tox -e py27-twcurrent,py27-trollius,py34-asyncio
+	coverage combine
 	coverage html
 	coverage report --show-missing
 
 # test under asyncio
 test_asyncio:
-	USE_ASYNCIO=1 python -m pytest -rsx
+	USE_ASYNCIO=1 python -m pytest -rsx autobahn
 	#WAMP_ROUTER_URL="ws://127.0.0.1:8080/ws" USE_ASYNCIO=1 python -m pytest -rsx
 
 test1:
diff --git a/tox.ini b/tox.ini
index 2137f0c58..696f1a5c7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -34,8 +34,8 @@ commands =
     sh -c "which python"
     python -V
     coverage --version
-    asyncio,trollius: coverage run {envbindir}/py.test autobahn/
-    twtrunk,twcurrent,tw121,tw132,twcurrent: coverage run {envbindir}/trial autobahn
+    asyncio,trollius: coverage run --parallel-mode {envbindir}/py.test autobahn/
+    twtrunk,twcurrent,tw121,tw132,twcurrent: coverage run --parallel-mode {envbindir}/trial autobahn
     coverage report
 whitelist_externals = sh
 setenv =