From aefd5b25e12ad9ec31411e3896aa2a0fc074fd0f Mon Sep 17 00:00:00 2001
From: Erik Rose <erik@mozilla.com>
Date: Tue, 19 Jan 2016 12:22:53 -0500
Subject: [PATCH] Revert switch to `python setup.py test` in tox.ini.

This had more of a purpose when we were moving mock to test_requires. I'll reintroduce this in the separate PR for that.

Also bring back the testing extra in tox for now.
---
 tox.ini | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/tox.ini b/tox.ini
index 54da87810..c54c9934c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,20 +8,23 @@
 skipsdist = true
 envlist = py{26,27,33,34,35},py{26,27}-oldest,cover,lint
 
+# nosetest -v => more verbose output, allows to detect busy waiting
+# loops, especially on Travis
+
 [testenv]
 # packages installed separately to ensure that downstream deps problems
 # are detected, c.f. #1002
 commands =
-    pip install -e acme
-    python acme/setup.py test
-    pip install -e .
-    python setup.py test
+    pip install -e acme[testing]
+    nosetests -v acme
+    pip install -e .[testing]
+    nosetests -v letsencrypt
     pip install -e letsencrypt-apache
-    python letsencrypt-apache/setup.py test
+    nosetests -v letsencrypt_apache
     pip install -e letsencrypt-nginx
-    python letsencrypt-nginx/setup.py test
+    nosetests -v letsencrypt_nginx
     pip install -e letshelp-letsencrypt
-    python letshelp-letsencrypt/setup.py test
+    nosetests -v letshelp_letsencrypt
 
 setenv =
     PYTHONPATH = {toxinidir}
@@ -37,18 +40,18 @@ deps =
 
 [testenv:py33]
 commands =
-    pip install -e acme
-    python acme/setup.py test
+    pip install -e acme[testing]
+    nosetests -v acme
 
 [testenv:py34]
 commands =
-    pip install -e acme
-    python acme/setup.py test
+    pip install -e acme[testing]
+    nosetests -v acme
 
 [testenv:py35]
 commands =
-    pip install -e acme
-    python acme/setup.py test
+    pip install -e acme[testing]
+    nosetests -v acme
 
 [testenv:cover]
 basepython = python2.7