From 785c29c22ff53592d5d22b660d697b013b3bc1c8 Mon Sep 17 00:00:00 2001
From: Charles Short <zulcss@gmail.com>
Date: Fri, 15 Jun 2018 17:38:47 -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: Id31d458418d904b568be0adf98d5b579cfd841cd
Signed-off-by: Charles Short <zulcss@gmail.com>
---
 .gitignore            | 3 ++-
 .stestr.conf          | 3 +++
 test-requirements.txt | 4 ++--
 tox.ini               | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 .stestr.conf

diff --git a/.gitignore b/.gitignore
index faa9c1d..2571e6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ ChangeLog
 .coverage
 cover/
 .testrepository/
-doc/build/
\ No newline at end of file
+doc/build/
+.stestr
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..ea359ca
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./tests
+top_dir=./
diff --git a/test-requirements.txt b/test-requirements.txt
index 7f7e5c0..f197fb2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,9 +5,9 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 bandit>=1.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 mock>=2.0.0 # BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
 oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
-os-testr>=1.0.0 # Apache-2.0
+stestr>=1.0.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 openstackdocstheme>=1.18.1 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 892336d..f989947 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,7 @@ whitelist_externals = bash
                       rm
 commands =
     find . -type f -name "*.py[c|o]" -delete
-    ostestr {posargs}
+    stestr run {posargs}
 
 [testenv:cover]
 basepython = python2.7