From 79e660d83f08729671d8abc4331f71469b0ec46c Mon Sep 17 00:00:00 2001
From: Steve Martinelli <stevemar@ca.ibm.com>
Date: Tue, 9 Sep 2014 10:14:54 -0400
Subject: [PATCH] Use oslo_debug_helper and remove our own version

With the latest version of oslotest, we can now take advantage
of a common oslo_debug_helper script.
We can now remove our own homebrewed version, minor changes to
tox.ini were needed.

Change-Id: I907f7203aefedc9b33c3dfbfecc9793e273a4a8f
---
 test-requirements.txt |  1 +
 tools/debug_helper.sh | 18 ------------------
 tox.ini               |  4 +---
 3 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100755 tools/debug_helper.sh

diff --git a/test-requirements.txt b/test-requirements.txt
index e0387f043..80dbdb063 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,6 +13,7 @@ mock>=1.0
 mox3>=0.7.0
 oauthlib>=0.6
 oslosphinx>=2.2.0  # Apache-2.0
+oslotest>=1.2.0  # Apache-2.0
 pycrypto>=2.6
 requests-mock>=0.4.0  # Apache-2.0
 sphinx>=1.1.2,!=1.2.0,<1.3
diff --git a/tools/debug_helper.sh b/tools/debug_helper.sh
deleted file mode 100755
index b80b10cf5..000000000
--- a/tools/debug_helper.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-TMP_DIR=`mktemp -d` || exit 1
-trap "rm -rf $TMP_DIR" EXIT
-
-ALL_TESTS=$TMP_DIR/all_tests
-TESTS_TO_RUN=$TMP_DIR/ksc_to_run
-
-python -m testtools.run discover -t ./ ./keystoneclient/tests --list > $ALL_TESTS
-
-if [ "$1" ]
-then
-    grep "$1" < $ALL_TESTS > $TESTS_TO_RUN
-else
-    mv $ALL_TESTS $TESTS_TO_RUN
-fi
-
-python -m testtools.run discover --load-list $TESTS_TO_RUN
diff --git a/tox.ini b/tox.ini
index e2b861783..f8a984dcb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,9 +28,7 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
 downloadcache = ~/cache/pip
 
 [testenv:debug]
-
-commands =
- {toxinidir}/tools/debug_helper.sh {posargs}
+commands = oslo_debug_helper -t keystoneclient/tests {posargs}
 
 [flake8]
 # F821: undefined name