From caf10ca6a72a209c8f6eccf44ce460da2b3c47ed Mon Sep 17 00:00:00 2001
From: "James E. Blair" <corvus@inaugust.com>
Date: Mon, 14 Jan 2013 21:44:21 +0000
Subject: [PATCH] Revert "Use testr setuptools commands."

This reverts commit c945b71929d7dc872ea27103ca8b6ec3d5cc7cd5
which caused the unit test command to always exit sucessfully.

Change-Id: I410cbc878675503f0ce6e50bddc4fd0552370c46
---
 .coveragerc |  3 +--
 tox.ini     | 15 +++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 902a94349..82fe47792 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,7 +1,6 @@
 [run]
 branch = True
-source = nova
-omit = nova/tests/*,DynamicallyCompiledCheetahTemplate.py
+omit = /usr*,setup.py,*egg*,.venv/*,.tox/*,nova/tests/*
 
 [report]
 ignore-errors = True
diff --git a/tox.ini b/tox.ini
index cf565c19f..1c43be4ed 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,8 @@ setenv = VIRTUAL_ENV={envdir}
          LC_ALL=C
 deps = -r{toxinidir}/tools/pip-requires
        -r{toxinidir}/tools/test-requires
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+commands = bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi'
+           bash -c 'testr run --parallel {posargs} ; RET=$? ; echo "Slowest Tests" ; testr slowest && exit $RET'
 
 [tox:jenkins]
 sitepackages = True
@@ -33,11 +34,13 @@ deps = pyflakes
 commands = python tools/flakes.py nova
 
 [testenv:cover]
-# Also do not run test_coverage_ext tests while gathering coverage as those
-# tests conflict with coverage.
-commands =
-  python setup.py testr --coverage \
-    --testr-args='^(?!.*test_coverage_ext).*$'
+# Need to omit DynamicallyCompiledCheetahTemplate.py from coverage because
+# it ceases to exist post test run. Also do not run test_coverage_ext tests
+# while gathering coverage as those tests conflict with coverage.
+setenv = OMIT=--omit=DynamicallyCompiledCheetahTemplate.py
+         PYTHON=coverage run --source nova --parallel-mode
+commands = bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi'
+           bash -c 'testr run --parallel \^\(\?\!\.\*test_coverage_ext\)\.\*\$ ; RET=$? ; coverage combine ; coverage html -d ./cover $OMIT && exit $RET'
 
 [testenv:venv]
 commands = {posargs}