From 5e3a06d887939a4d7956337fc6970c4a5efced82 Mon Sep 17 00:00:00 2001
From: Charles Short <zulcss@gmail.com>
Date: Tue, 5 Jun 2018 14:30:33 -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: I4c20eb58982c66598f0283864b9863b84cc29e57
Signed-off-by: Charles Short <zulcss@gmail.com>
---
 .gitignore                            | 1 +
 kolla_cli/tests/functional/README.txt | 2 +-
 test-requirements.txt                 | 2 +-
 tox.ini                               | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1af3679..e4f3bd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ etc/
 kolla_cli.egg-info/*
 .testrepository
 .mypy_cache/*
+.stestr
diff --git a/kolla_cli/tests/functional/README.txt b/kolla_cli/tests/functional/README.txt
index fd0081d..f8a23d9 100644
--- a/kolla_cli/tests/functional/README.txt
+++ b/kolla_cli/tests/functional/README.txt
@@ -16,4 +16,4 @@ export KOLLA_TOOLS_DIR=./tools/
 Then you can run a single test, for eg:
 
 source .tox/functional/bin/activate
-ostestr -n kolla_cli.tests.functional.test_deploy.TestFunctional.test_deploy
+stestr run -n kolla_cli.tests.functional.test_deploy.TestFunctional.test_deploy
diff --git a/test-requirements.txt b/test-requirements.txt
index bf21a0c..49f496b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,7 +11,7 @@ fixtures>=0.3.14
 mock>=1.0
 mypy>=0.6; python_version>'2.7'
 oslo.utils>=3.33.0 # Apache-2.0
-os-testr>=1.0.0 # Apache-2.0
+stestr>=1.0.0 # Apache-2.0
 pexpect>=4.0.1
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 sphinxcontrib-pecanwsme>=0.8
diff --git a/tox.ini b/tox.ini
index 87f7547..d2757bd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@ commands =
   find . -type d -name "__pycache__" -delete
 
 [testenv:py27]
-commands = ostestr {posargs}
+commands = stestr run {posargs}
 
 [testenv:functional]
 whitelist_externals =
@@ -33,7 +33,7 @@ commands =
   {[testenv]commands}
   {toxinidir}/kolla_cli/tests/functional/functional_test_setup.sh
   bash -c "pushd /tmp/kollaclitest/usr/share/kolla-ansible/git; python setup.py install; popd"
-  ostestr {posargs} --serial
+  stestr run {posargs} --serial
 
 [testenv:functional-py35]
 basepython = py35: python3.5