Merge "Switch to use ostestr"

test-requirements.txt

@@ -8,12 +8,10 @@ coverage>=3.6
 discover
 mock>=1.0
 mox>=0.5.3
-#MySQL-python
 oslosphinx>=2.5.0 # Apache-2.0
 oslotest>=1.5.1 # Apache-2.0
 paramiko>=1.13.0
-#psycopg2
-#pysqlite
+os-testr>=0.1.0
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 testrepository>=0.0.18
 testscenarios>=0.4

tox.ini

@@ -13,7 +13,7 @@ usedevelop = True
 install_command = pip install {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+commands = ostestr {posargs}
 
 whitelist_externals = bash