From e690af4a3c2d6efd7afcde6d87196895030d7576 Mon Sep 17 00:00:00 2001
From: Vu Cong Tuan <tuanvc@vn.fujitsu.com>
Date: Tue, 3 Jul 2018 09:47:05 +0700
Subject: [PATCH] Switch to stestr

According to Openstack summit session [1],
stestr is maintained project to which all Openstack projects should migrate.
Let's switch to stestr as other projects have already moved to it.

[1] https://etherpad.openstack.org/p/YVR-python-pti

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

diff --git a/.gitignore b/.gitignore
index ce7cc3d..164d3ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@ ChangeLog
 openstack/versioninfo
 *.egg
 openstack/common/db/*.sqlite
-.testrepository/
+.stestr/
 .project
 .pydevproject
 etc/openstack.conf.sample
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..9be85a5
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./oslo_i18n/tests
+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 7cb08eb..f92a5cc 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -43,8 +43,8 @@ smmap==0.9.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
 testtools==2.2.0
 traceback2==1.4.0
diff --git a/test-requirements.txt b/test-requirements.txt
index b593c52..83c362b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,8 +2,9 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+stestr>=2.0.0 # Apache-2.0
 
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
 openstackdocstheme>=1.18.1 # Apache-2.0
 
 mock>=2.0.0 # BSD
diff --git a/tox.ini b/tox.ini
index a848fe8..ffe0684 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,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