diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-16 18:20:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-16 18:20:28 +0000 |
| commit | c6baddc6ac7c6e81fe32ef55d009d02842fe1477 (patch) | |
| tree | 46af19046d865b7ba7c8c529f6a613872c8283a1 | |
| parent | 766840fc004cf0e14c4c4761af24139410015483 (diff) | |
| parent | a4c13473aa09edee3c16733a4ff16f2cc206ad66 (diff) | |
| download | keystonemiddleware-c6baddc6ac7c6e81fe32ef55d009d02842fe1477.tar.gz | |
Merge "Use oslo_debug_helper and remove our own version"
| -rw-r--r-- | test-requirements.txt | 1 | ||||
| -rwxr-xr-x | tools/debug_helper.sh | 18 | ||||
| -rw-r--r-- | tox.ini | 3 |
3 files changed, 2 insertions, 20 deletions
diff --git a/test-requirements.txt b/test-requirements.txt index 83173e6..a13ef95 100644 --- a/test-requirements.txt +++ b/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 diff --git a/tools/debug_helper.sh b/tools/debug_helper.sh deleted file mode 100755 index a3bed9d..0000000 --- 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 ./ ./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 @@ -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 |