Merge "Switch to stestr"

.gitignore

@@ -8,7 +8,7 @@
 *.pyc
 /doc/source/teams/*.rst
 /.coverage*
-/.testrepository/
+.stestr/
 /cover/
 /unreleased-*.txt
 gerrit.ini

.stestr.conf

@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./openstack_releases/tests
+top_dir=./

.testr.conf

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

test-requirements.txt

@@ -6,7 +6,7 @@ hacking>=1.0.0,<1.1.0
 
 fixtures>=3.0.0 # Apache-2.0/BSD
 python-subunit>=0.0.18 # Apache-2.0/BSD
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
 oslotest>=1.10.0 # Apache-2.0

tox.ini

@@ -14,10 +14,14 @@ setenv =
    PYTHONUNBUFFERED=1
    LOGDIR={envdir}/log
    TMPDIR={envdir}/tmp
+   PYTHON=coverage run --source openstack_releases --parallel-mode
 basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
 commands =
-  python setup.py testr --coverage --testr-args='{posargs}'
+    stestr run '{posargs}'
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
     coverage report --show-missing
 
 [testenv:validate]
@@ -56,9 +60,6 @@ commands = {posargs}
 [testenv:history]
 commands = {toxinidir}/tools/build_tag_history.sh {toxinidir}
 
-[testenv:cover]
-#commands = python setup.py testr --coverage --testr-args='{posargs}'
-
 [testenv:docs]
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}