Merge "Use oslo_debug_helper and remove our own version"

2014-10-27 14:01:41 +00:00 · 2014-10-27 14:01:41 +00:00 · 63300488c9
commit 63300488c9
parent 3824554018 ffaac84e55
2 changed files with 2 additions and 3 deletions
--- 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.3b1,<1.3
--- 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