From 897823fbd61ae9ba015af38e9fed5a5728de64c2 Mon Sep 17 00:00:00 2001
From: wangqi <wang.qi@99cloud.net>
Date: Tue, 22 May 2018 03:21:40 +0000
Subject: [PATCH] Switch to using stestr

When the TC merged I2637dd714cbb6d38ef8b8dc1083e359207118284 we're
supposed to invoke stestr rather than testr so lets do that

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

diff --git a/.gitignore b/.gitignore
index b32ba58..4b691a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ cover/
 .tox
 nosetests.xml
 .testrepository
+.stestr/
 .venv
 
 # Translations
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..e526867
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./oslotest/tests/unit
+top_path=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index fb62267..0000000
--- 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 36ab7c6..bfbf6a2 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -39,6 +39,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
 testtools==2.2.0
diff --git a/requirements.txt b/requirements.txt
index 9f3c706..bf900b8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@
 fixtures>=3.0.0 # Apache-2.0/BSD
 python-subunit>=1.0.0 # Apache-2.0/BSD
 six>=1.10.0 # MIT
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 testtools>=2.2.0 # MIT
 mock>=2.0.0 # BSD
 mox3>=0.20.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 99750d2..57e559e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,5 +13,5 @@ coverage!=4.4,>=4.0 # Apache-2.0
 sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
 openstackdocstheme>=1.18.1 # Apache-2.0
 oslo.config>=5.2.0 # Apache-2.0
-
+stestr==2.0.0
 reno>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 78c0aa9..e3dc310 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+commands = stestr run --slowest {posargs}
 
 [testenv:py27]
 basepython = python2.7
@@ -20,8 +20,13 @@ commands = flake8
 
 [testenv:cover]
 basepython = python3
+setenv =
+    PYTHON=coverage run --source $project --parallel-mode
 commands =
-  python setup.py test --coverage --testr-args='{posargs}'
+    stestr run '{posargs}'
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
 
 [testenv:venv]
 basepython = python3