From 105d89e9ec96a7a82e383cfb4f0a65ae95f7bcae Mon Sep 17 00:00:00 2001
From: Charles Short <zulcss@gmail.com>
Date: Sat, 2 Jun 2018 21:27:11 -0400
Subject: [PATCH] Switch to using stestr

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: I847368004d14c2f213d36c602398abfdbfa381cd
Signed-off-by: Charles Short <zulcss@gmail.com>
---
 .stestr.conf          | 3 +++
 test-requirements.txt | 2 +-
 tools/pretty_tox.sh   | 6 ------
 tox.ini               | 5 +++--
 4 files changed, 7 insertions(+), 9 deletions(-)
 create mode 100644 .stestr.conf
 delete mode 100755 tools/pretty_tox.sh

diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 000000000..e3746bbc0
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./designate/tests}
+top_dir=./
diff --git a/test-requirements.txt b/test-requirements.txt
index bcad4f1e9..25af7ebe2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,7 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 mock>=2.0.0 # BSD
-os-testr>=1.0.0 # Apache-2.0
+stestr>=2.0.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 requests-mock>=1.2.0 # Apache-2.0
 testtools>=2.2.0 # MIT
diff --git a/tools/pretty_tox.sh b/tools/pretty_tox.sh
deleted file mode 100755
index 0fc360530..000000000
--- a/tools/pretty_tox.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-
-TESTRARGS=$1
-
-exec 3>&1
-status=$(exec 4>&1 >&3; ( python setup.py testr --slowest --testr-args="--subunit $TESTRARGS"; echo $? >&4 ) | subunit-trace -f) && exit $status
diff --git a/tox.ini b/tox.ini
index 50b96b970..a31dd9efc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,12 +30,13 @@ passenv = http_proxy
 [testenv:py27]
 commands =
   {[testenv]commands}
-  sh tools/pretty_tox.sh '{posargs}'
+  stestr run '{posargs}'
+  stestr slowest
 
 [testenv:py35]
 commands =
   {[testenv]commands}
-  ostestr '{posargs}'
+  stestr run '{posargs}'
 
 [testenv:docs]
 deps =