From 1c124a309bc941c078b8bb622ea248a3ed3829e1 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Tue, 9 Jun 2015 11:28:10 +0200
Subject: [PATCH] Switch to os-testr to control testr

It's a nice wrapper spinned out recently from tempest-lib that should
cover all our needs that we currently fulfill with pretty_tox.sh.

Change-Id: I2268ed45ab628fe5dcab657d6287594847ab587c
---
 test-requirements.txt | 1 +
 tools/pretty_tox.sh   | 6 ------
 tox.ini               | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)
 delete mode 100755 tools/pretty_tox.sh

diff --git a/test-requirements.txt b/test-requirements.txt
index be4bd087cbc..6a6436aa3fd 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -16,4 +16,5 @@ 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
diff --git a/tools/pretty_tox.sh b/tools/pretty_tox.sh
deleted file mode 100755
index 0fc360530d5..00000000000
--- a/tools/pretty_tox.sh
+++ /dev/null
@@ -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
diff --git a/tox.ini b/tox.ini
index bd28ed3e269..8f9cf95dc9d 100644
--- a/tox.ini
+++ b/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]