From e734468fdfcda62b682f5826b5ab69519a9c3303 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Thu, 31 May 2018 06:09:32 -0700
Subject: [PATCH] Switch coverage tox env to stestr

We already switched the unit tests to follow the updated PTI
guidelines[1] but neglected to switch the coverage environment. Do that
now.

[1] https://governance.openstack.org/tc/reference/pti/python.html#python-test-running

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

diff --git a/test-requirements.txt b/test-requirements.txt
index 75e6bf52..dd72e636 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,10 +13,9 @@ oslotest>=3.2.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
 requests-mock>=1.2.0 # Apache-2.0
 stevedore>=1.20.0 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr  # Apache-2.0
 testresources>=2.0.0 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
-os-testr>=1.0.0 # Apache-2.0
 python-memcached>=1.56 # PSF
 WebTest>=2.0.27 # MIT
 
diff --git a/tox.ini b/tox.ini
index 96b843eb..860a0a35 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,7 +33,14 @@ commands = bandit -r keystonemiddleware -x tests -n5
 commands = {posargs}
 
 [testenv:cover]
-commands = python setup.py testr --coverage --testr-args='{posargs}'
+setenv =
+    {[testenv]setenv}
+    PYTHON=coverage run --source keystonemiddleware --parallel-mode
+commands =
+    stestr run {posargs}
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
 
 [testenv:debug]