Merge "Switch tox unit test command to use ostestr"

.gitignore

@@ -25,6 +25,7 @@ pip-log.txt
 .coverage
 .tox
 nosetests.xml
+.stestr
 .testrepository
 
 # Translations
@@ -48,4 +49,4 @@ ChangeLog
 
 # Editors
 *~
-.*.swp
+.*.swp

.stestr.conf

@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${TESTS_DIR:-./tests/}
+top_dir=./

.testr.conf

@@ -1,7 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
-             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list

requirements.txt

@@ -1,6 +1,4 @@
 pbr>=0.6,!=0.7,<1.0
 sphinx!=1.6.6,<1.7.0,>=1.6.2 # BSD
 openstackdocstheme>=1.18.1 # Apache-2.0
-testrepository>=0.0.18
-testtools>=0.9.34
 yasfb>=0.5.1

test-requirements.txt

@@ -3,4 +3,5 @@
 # process, which may cause wedges in the gate later.
 
 doc8 # Apache-2.0
-
+os-testr>=1.0.0 # Apache-2.0
+testtools>=0.9.34

tox.ini

@@ -12,7 +12,7 @@ deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
 commands =
-    python setup.py testr --slowest --testr-args='{posargs}'
+    ostestr {posargs}
     doc8 priorities/ specs/ doc/source README.rst
 
 [testenv:venv]