From d9f896d43068a8df5540b81f2aadc3891e43ff98 Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Thu, 9 Feb 2017 14:40:29 +0100
Subject: [PATCH] Use ostestr instead of the custom pretty_tox.sh

Switch to os-testr as wrapper for testr, instead of the custom
script pretty_tox.sh.

Change-Id: If10ac96ac32813714be2b83f895071820126dbd8
---
 tools/pretty_tox.sh | 12 ------------
 tox.ini             |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100755 tools/pretty_tox.sh

diff --git a/tools/pretty_tox.sh b/tools/pretty_tox.sh
deleted file mode 100755
index 01b67a8d97..0000000000
--- a/tools/pretty_tox.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -o pipefail
-
-TESTRARGS=$1
-python setup.py testr --testr-args="--subunit $TESTRARGS" | subunit-trace -f
-retval=$?
-# NOTE(mtreinish) The pipe above would eat the slowest display from pbr's testr
-# wrapper so just manually print the slowest tests.
-echo -e "\nSlowest Tests:\n"
-testr slowest
-exit $retval
diff --git a/tox.ini b/tox.ini
index 6e0749a9ca..810b6cb0cc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ deps = -r{toxinidir}/test-requirements.txt
        .[ldap,memcache,mongodb]
 commands =
   find keystone -type f -name "*.pyc" -delete
-  bash tools/pretty_tox.sh '{posargs}'
+  ostestr '{posargs}'
 whitelist_externals =
   bash
   find