From 1c663223e73d6e905b24e1e01c0ab87c22378128 Mon Sep 17 00:00:00 2001
From: Charles Short <zulcss@gmail.com>
Date: Mon, 28 May 2018 12:52:52 -0400
Subject: [PATCH] Switch to using stestr from ostestr

According to Openstack summit session [1] stestr is
maintained project to which all Openstack projects
should migrate.
Let's switch it then.

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

Change-Id: Ia63e48a8ffee765a2d0ae43ff0054e3c5f61c992
Signed-off-by: Charles Short <zulcss@gmail.com>
---
 .stestr.conf          | 3 +++
 .testr.conf           | 6 ------
 lower-constraints.txt | 1 -
 test-requirements.txt | 3 +--
 tox.ini               | 3 ++-
 5 files changed, 6 insertions(+), 10 deletions(-)
 create mode 100644 .stestr.conf
 delete mode 100644 .testr.conf

diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 000000000..92f7ddfb9
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./senlin/tests/unit}
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 2c8b3fa90..000000000
--- a/.testr.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[DEFAULT]
-test_command=
-    PYTHON=$(echo ${PYTHON:-python} | sed 's/--source senlin//g')
-    ${PYTHON} -m subunit.run discover ${OS_TEST_PATH:-./senlin/tests} -t . $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 35a1210f5..ffc34cf7a 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -58,7 +58,6 @@ netifaces==0.10.6
 openstacksdk==0.11.2
 os-client-config==1.29.0
 os-service-types==1.2.0
-os-testr==1.0.0
 oslo.cache==1.29.0
 oslo.concurrency==3.26.0
 oslo.config==5.2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 2e24d689e..90b12c350 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,10 +8,9 @@ flake8<2.6.0,>=2.5.4 # MIT
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 mock>=2.0.0 # BSD
 oslotest>=3.2.0 # Apache-2.0
-os-testr>=1.0.0 # Apache-2.0
+stestr>=2.0.0 # Apache-2.0
 PyMySQL>=0.7.6 # MIT License
 tempest>=17.1.0 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 
diff --git a/tox.ini b/tox.ini
index 7df34c894..bdc1aa0aa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,8 @@ install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstac
 commands =
     find . -type f -name "*.py[c|o]" -delete
     rm -f .testrepository/times.dbm
-    ostestr --slowest --regex 'senlin.tests.unit.*' {posargs}
+    stestr run '{posargs}'
+    stestr slowest
 
 whitelist_externals = bash
                       find