From 295b107107dc0054b25c07ab01a47cf8603483d7 Mon Sep 17 00:00:00 2001
From: Todd Leonhardt <todd.leonhardt@gmail.com>
Date: Sun, 2 Jul 2017 21:33:06 -0400
Subject: [PATCH 1/2] Tweak tox.ini and .coveragerc in hopes of getting
 pytest-cov and pytest-xdist to play nicely together

---
 .coveragerc |  2 ++
 tox.ini     | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index bdd0ee85f..9f8518662 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,5 +1,7 @@
 # .coveragerc to control coverage.py
 [run]
+# Source
+source = cmd.py,tests
 # (boolean, default False): whether to measure branch coverage in addition to statement coverage.
 branch = False
 
diff --git a/tox.ini b/tox.ini
index 946f21366..cb2e8ee18 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,9 @@
 [tox]
 envlist = py27,py33,py34,py35,py36,py36-winpy37,pypy
 
+[pytest]
+testpaths = tests
+
 [testenv]
 passenv = CI TRAVIS TRAVIS_* APPVEYOR*
 
@@ -12,9 +15,10 @@ deps =
   pyperclip
   pytest
   pytest-cov
+  pytest-xdist
   six
 commands =
-  py.test -v --cov=cmd2 --basetemp={envtmpdir} {posargs}
+  py.test -v --cov=cmd2 -nauto --cov-report=term-missing tests
   codecov
 
 [testenv:py33]
@@ -25,7 +29,7 @@ deps =
   pytest
   pytest-xdist
   six
-commands = py.test -v -n2
+commands = py.test -v -nauto
 
 [testenv:py34]
 deps =
@@ -35,7 +39,7 @@ deps =
   pytest
   pytest-xdist
   six
-commands = py.test -v -n2
+commands = py.test -v -nauto
 
 [testenv:py35]
 deps =
@@ -45,7 +49,7 @@ deps =
   pytest
   pytest-xdist
   six
-commands = py.test -v -n2
+commands = py.test -v -nauto
 
 [testenv:py36]
 deps =
@@ -55,9 +59,10 @@ deps =
   pyperclip
   pytest
   pytest-cov
+  pytest-xdist
   six
 commands =
-  py.test -v --cov=cmd2 --basetemp={envtmpdir} {posargs}
+  py.test -v --cov=cmd2 -nauto --cov-report=term-missing tests
   codecov
 
 [testenv:py36-win]
@@ -68,7 +73,7 @@ deps =
   pytest
   pytest-xdist
   six
-commands = py.test -v -n2
+commands = py.test -v -nauto
 
 [testenv:py37]
 deps =
@@ -78,5 +83,5 @@ deps =
   pytest
   pytest-xdist
   six
-commands = py.test -v -n2
+commands = py.test -v -nauto
 

From 6b0a8d82db3a848d5316be6de2fb3fa2127a046a Mon Sep 17 00:00:00 2001
From: Todd Leonhardt <todd.leonhardt@gmail.com>
Date: Sun, 2 Jul 2017 21:48:57 -0400
Subject: [PATCH 2/2] Another tweak to tox.ini and .coveragerc, fingers crossed
 ...

---
 .coveragerc |  2 +-
 tox.ini     | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 9f8518662..a50fe0e7c 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,7 +1,7 @@
 # .coveragerc to control coverage.py
 [run]
 # Source
-source = cmd.py,tests
+source = cmd2.py
 # (boolean, default False): whether to measure branch coverage in addition to statement coverage.
 branch = False
 
diff --git a/tox.ini b/tox.ini
index cb2e8ee18..1a7e26870 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,8 @@ testpaths = tests
 
 [testenv]
 passenv = CI TRAVIS TRAVIS_* APPVEYOR*
+setenv =
+    PYTHONPATH={toxinidir}
 
 [testenv:py27]
 deps =
@@ -18,7 +20,7 @@ deps =
   pytest-xdist
   six
 commands =
-  py.test -v --cov=cmd2 -nauto --cov-report=term-missing tests
+  py.test {posargs: -n 2} --cov=cmd2 --cov-report=term-missing
   codecov
 
 [testenv:py33]
@@ -29,7 +31,7 @@ deps =
   pytest
   pytest-xdist
   six
-commands = py.test -v -nauto
+commands = py.test -v -n2
 
 [testenv:py34]
 deps =
@@ -39,7 +41,7 @@ deps =
   pytest
   pytest-xdist
   six
-commands = py.test -v -nauto
+commands = py.test -v -n2
 
 [testenv:py35]
 deps =
@@ -49,7 +51,7 @@ deps =
   pytest
   pytest-xdist
   six
-commands = py.test -v -nauto
+commands = py.test -v -n2
 
 [testenv:py36]
 deps =
@@ -62,7 +64,7 @@ deps =
   pytest-xdist
   six
 commands =
-  py.test -v --cov=cmd2 -nauto --cov-report=term-missing tests
+  py.test {posargs: -n 2} --cov=cmd2 --cov-report=term-missing
   codecov
 
 [testenv:py36-win]
@@ -73,7 +75,7 @@ deps =
   pytest
   pytest-xdist
   six
-commands = py.test -v -nauto
+commands = py.test -v -n2
 
 [testenv:py37]
 deps =
@@ -83,5 +85,5 @@ deps =
   pytest
   pytest-xdist
   six
-commands = py.test -v -nauto
+commands = py.test -v -n2