Merge "Convert project to os-testr"

2015-09-16 21:03:26 +00:00 · 2015-09-16 21:03:26 +00:00 · 7d2d29aedd
commit 7d2d29aedd
parent 6ce09e133d ec16789cf1
2 changed files with 2 additions and 1 deletions
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -14,6 +14,7 @@ oauthlib>=0.6
 oslo.config>=2.3.0 # Apache-2.0
 oslosphinx>=2.5.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
+os-testr>=0.1.0
 pycrypto>=2.6
 requests-mock>=0.6.0 # Apache-2.0
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
--- a/tox.ini
+++ b/tox.ini
@ -12,7 +12,7 @@ setenv = VIRTUAL_ENV={envdir}

 deps = -r{toxinidir}/requirements.txt
       -r{toxinidir}/test-requirements.txt
-commands = python setup.py testr --testr-args='{posargs}'
+commands = ostestr {posargs}

 [testenv:pep8]
 commands =