From 803b2a80d800edf1a70caa56ebe2397b11995521 Mon Sep 17 00:00:00 2001
From: "Bob.Haddleton" <bob.haddleton@nokia.com>
Date: Sun, 10 Jun 2018 20:05:21 -0500
Subject: [PATCH] Use stestr instead of testr

Change-Id: I29f32edc2d84f6dde3c405bedacb41bd40f806a5
---
 .gitignore            | 4 +++-
 .stestr.conf          | 4 ++++
 .testr.conf           | 7 -------
 lower-constraints.txt | 1 +
 test-requirements.txt | 2 +-
 tox.ini               | 9 +++++++--
 6 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 .stestr.conf
 delete mode 100644 .testr.conf

diff --git a/.gitignore b/.gitignore
index c1721045..09801b39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,8 +23,10 @@ pip-log.txt
 
 # Unit test / coverage reports
 .coverage
+cover
 .tox
 nosetests.xml
+.stestr/
 .testrepository
 
 # Translations
@@ -53,4 +55,4 @@ ChangeLog
 *.iml
 
 # OSX
-.DS_Store
\ No newline at end of file
+.DS_Store
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 00000000..3fe8e4c3
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=./toscaparser/tests/
+top_dir=./
+
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index fb622677..00000000
--- a/.testr.conf
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/lower-constraints.txt b/lower-constraints.txt
index f1452584..fd119003 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -40,6 +40,7 @@ six==1.10.0
 snowballstemmer==1.2.1
 Sphinx==1.6.5
 sphinxcontrib-websupport==1.0.1
+stestr==2.0.0
 stevedore==1.20.0
 testrepository==0.0.18
 testscenarios==0.4
diff --git a/test-requirements.txt b/test-requirements.txt
index 8f582893..1fe45eef 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,6 +6,6 @@ coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 oslotest>=3.2.0 # Apache-2.0
 python-subunit>=1.0.0 # 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>=2.2.0 # MIT
diff --git a/tox.ini b/tox.ini
index 78a9de40..7efc8fa9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ deps =
        -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = python setup.py test --slowest --testr-args='{posargs}'
+commands = stestr run --slowest '{posargs}'
 
 [testenv:pep8]
 basepython = python3
@@ -26,7 +26,12 @@ commands = {posargs}
 
 [testenv:cover]
 basepython = python3
-commands = python setup.py test --coverage --coverage-package-name=toscaparser --testr-args='{posargs}'
+setenv =
+    PYTHON=coverage run --source $project --parallel-mode
+commands = stestr run '{posargs}'
+           coverage combine
+           coverage html -d cover
+           coverage xml -o cover/coverage.xml
 
 [testenv:docs]
 basepython = python3