Merge "Switch to os-testr to control testr"

test-requirements.txt

@@ -16,5 +16,6 @@ testtools>=0.9.36,!=1.2.0
 testscenarios>=0.4
 WebTest>=2.0
 oslotest>=1.5.1  # Apache-2.0
+os-testr>=0.1.0
 tempest-lib>=0.5.0
 ddt>=0.7.0

tools/pretty_tox.sh

@@ -1,6 +0,0 @@
-#! /bin/sh
-
-TESTRARGS=$1
-
-exec 3>&1
-status=$(exec 4>&1 >&3; ( python setup.py testr --slowest --testr-args="--subunit $TESTRARGS"; echo $? >&4 ) | subunit-trace -f) && exit $status

tox.ini

@@ -12,8 +12,8 @@ deps = -r{toxinidir}/requirements.txt
 whitelist_externals = sh
 commands =
   dsvm-functional: {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
-  sh tools/pretty_tox.sh '{posargs}'
-# there is also secret magic in pretty_tox.sh which lets you run in a fail only
+  ostestr --regex '{posargs}'
+# there is also secret magic in ostestr which lets you run in a fail only
 # mode. To do this define the TRACE_FAILONLY environmental variable.
 
 [testenv:api]