Merge "Use oslo_debug_helper and remove our own version"

test-requirements.txt

@@ -10,6 +10,7 @@ httpretty>=0.8.0,!=0.8.1,!=0.8.2,!=0.8.3
 mock>=1.0
 pycrypto>=2.6
 oslosphinx>=2.2.0.0a2
+oslotest>=1.1.0.0a2
 sphinx>=1.1.2,!=1.2.0,<1.3
 testrepository>=0.0.18
 testresources>=0.2.4

tools/debug_helper.sh

@@ -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 ./ ./keystonemiddleware/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

tox.ini

@@ -29,8 +29,7 @@ downloadcache = ~/cache/pip
 
 [testenv:debug]
 
-commands =
- {toxinidir}/tools/debug_helper.sh {posargs}
+commands = oslo_debug_helper.sh {posargs}
 
 [flake8]
 # F821: undefined name