Merge "Switch tox unit test command to use ostestr"

test-requirements.txt

@@ -5,10 +5,10 @@ hacking<0.11,>=0.10.0
 coverage>=3.6 # Apache-2.0
 discover # BSD
 mock>=1.2 # BSD
-testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
 python-subunit>=0.0.18 # Apache-2.0/BSD
 oslotest>=1.10.0 # Apache-2.0
+os-testr>=0.4.1 # Apache-2.0
 
 # Doc requirements
 doc8 # Apache-2.0

tox.ini

@@ -9,11 +9,8 @@ install_command = pip install --allow-external -U {opts} {packages}
 setenv =
   VIRTUAL_ENV={envdir}
   OS_TEST_PATH=./ironic_python_agent/tests/unit
-deps =
-  -r{toxinidir}/requirements.txt
-  -r{toxinidir}/test-requirements.txt
-commands =
-  python setup.py testr --slowest --testr-args='{posargs:}'
+deps = -r{toxinidir}/test-requirements.txt
+commands = ostestr {posargs}
 
 [testenv:func]
 usedevelop = True
@@ -24,8 +21,7 @@ setenv =
   OS_TEST_PATH=./ironic_python_agent/tests/functional
   TEST_PORT=9999
   IPA_WAIT_TRIES=100
-commands =
-  python setup.py testr --slowest --testr-args='{posargs:}'
+commands = ostestr {posargs}
 
 [testenv:pep8]
 commands =