From 4abd5377e4d847102a4e87a528d689e31cc1713c Mon Sep 17 00:00:00 2001
From: Vu Cong Tuan <tuanvc@vn.fujitsu.com>
Date: Tue, 3 Jul 2018 09:42:57 +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: Ic863da849df2a728ce6b26bfd946262a5439fcad
---
 .gitignore            | 3 +--
 .stestr.conf          | 3 +++
 .testr.conf           | 7 -------
 lower-constraints.txt | 2 +-
 test-requirements.txt | 1 +
 tox.ini               | 2 +-
 6 files changed, 7 insertions(+), 11 deletions(-)
 create mode 100644 .stestr.conf
 delete mode 100644 .testr.conf

diff --git a/.gitignore b/.gitignore
index facf719..3f876c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,8 +25,7 @@ pip-log.txt
 .coverage
 cover
 .tox
-nosetests.xml
-.testrepository
+.stestr/
 
 # Translations
 *.mo
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..17a5157
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./oslo_context/tests
+top_path=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index ccafd7c..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 ./ ./oslo_context $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/lower-constraints.txt b/lower-constraints.txt
index d0b22e0..f61acb5 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -28,8 +28,8 @@ requests==2.14.2
 requestsexceptions==1.2.0
 six==1.10.0
 smmap==0.9.0
+stestr==2.0.0
 stevedore==1.20.0
-testrepository==0.0.18
 testtools==2.2.0
 traceback2==1.4.0
 unittest2==1.1.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 0119686..096cc97 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,6 +6,7 @@ fixtures>=3.0.0 # Apache-2.0/BSD
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
+stestr>=2.0.0 # Apache-2.0
 
 # Bandit security code scanner
 bandit>=1.1.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 99b330f..3471871 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:pep8]
 basepython = python3