From b0577a9a3698bfc306e5b022211d60b91d40d2b9 Mon Sep 17 00:00:00 2001
From: Vu Cong Tuan <tuanvc@vn.fujitsu.com>
Date: Tue, 10 Jul 2018 17:01:27 +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: I0190d49f1f6153937a2032f199a17696c21efa83
---
 .gitignore            |  2 +-
 .stestr.conf          |  4 ++++
 .testr.conf           |  4 ----
 lower-constraints.txt |  2 +-
 test-requirements.txt |  4 ++--
 tox.ini               | 11 +----------
 6 files changed, 9 insertions(+), 18 deletions(-)
 create mode 100644 .stestr.conf
 delete mode 100644 .testr.conf

diff --git a/.gitignore b/.gitignore
index eefeb5d..f7f355f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@ pip-log.txt
 # Unit test / coverage reports
 .coverage
 .tox
-.testrepository
+.stestr/
 
 #Translations
 *.mo
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..8e9a540
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=./mox3/tests
+top_dir=./
+
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 6c1541e..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 ${PYTHON:-python} -m subunit.run discover -t ./ ./ $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 5792734..885df0b 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -24,7 +24,7 @@ six==1.10.0
 snowballstemmer==1.2.1
 Sphinx==1.6.5
 sphinxcontrib-websupport==1.0.1
-testrepository==0.0.18
+stestr==2.0.0
 testtools==2.2.0
 traceback2==1.4.0
 unittest2==1.1.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 3bcc68a..b692c51 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,12 +8,12 @@ flake8<2.6.0,>=2.5.4 # MIT
 
 coverage!=4.4,>=4.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
 testtools>=2.2.0 # MIT
 
 six>=1.10.0 # MIT
 
 # this is required for the docs build jobs
-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
 
diff --git a/tox.ini b/tox.ini
index 3e110d9..1f55064 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,11 +8,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 testr --slowest --testr-args='{posargs}'
-
-[testenv:py27]
-basepython = python2.7
+commands = stestr run --slowest {posargs}
 
 [testenv:docs]
 basepython = python3
@@ -26,11 +22,6 @@ commands = flake8
 basepython = python3
 commands = {posargs}
 
-[testenv:cover]
-basepython = python3
-commands =
-  python setup.py testr --coverage
-
 [flake8]
 show-source = true
 ignore = E721