From 64a90a6700fbc2a9114b432a1bde494372589410 Mon Sep 17 00:00:00 2001
From: Pavlo Shchelokovskyy <shchelokovskyy@gmail.com>
Date: Wed, 6 Jun 2018 19:04:13 +0300
Subject: [PATCH] Comply with PTI for Python testing

Project Testing Interface for Python [0] suggests to use stestr
as unit test runner uniformly across all OpenStack projects.

[0] https://governance.openstack.org/tc/reference/pti/python.html

Change-Id: I1c321500a2256b09cb6a58f6cd7070c9dc702555
---
 test-requirements.txt | 2 +-
 tox.ini               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 8bfb2dd3d3..7a2716f431 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,9 +10,9 @@ Babel!=2.4.0,>=2.3.4 # BSD
 PyMySQL>=0.7.6 # MIT License
 iso8601>=0.1.11 # MIT
 oslotest>=3.2.0 # Apache-2.0
+stestr # Apache-2.0
 psycopg2>=2.6.2 # LGPL/ZPL
 testtools>=2.2.0 # MIT
-os-testr>=1.0.0 # Apache-2.0
 testresources>=2.0.0 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 WebTest>=2.0.27 # MIT
diff --git a/tox.ini b/tox.ini
index ed643faba8..1b6e7a9876 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ setenv = VIRTUAL_ENV={envdir}
          TESTS_DIR=./ironic/tests/unit/
 deps = -r{toxinidir}/test-requirements.txt
 commands =
-    ostestr {posargs}
+    stestr run {posargs}
 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 
 [testenv:unit-with-driver-libs]
@@ -45,7 +45,7 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHON=coverage run --source ironic --omit='*tests*' --parallel-mode
 commands =
   coverage erase
-  ostestr {posargs}
+  stestr run {posargs}
   coverage combine
   coverage report --omit='*tests*'
   coverage html -d ./cover --omit='*tests*'