From dd3fdda86d3acc3def2373bbf3e8aa3c12f1dfac Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Wed, 6 Mar 2019 12:34:52 +0000
Subject: [PATCH] Switch to direct execution of stestr for unit tests

Drop dependency on ostestr, switch to using stestr run.

Change-Id: Idf1ddc01f891d58fecd7be119da9e8b1f124b5e0
---
 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 2b2c0e11..627da027 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,7 +5,7 @@ charm-tools>=2.4.4
 coverage>=3.6
 mock>=1.2
 flake8>=2.2.4,<=2.4.1
-os-testr>=0.4.1
+stestr
 requests>=2.18.4
 # BEGIN: Amulet OpenStack Charm Helper Requirements
 # Liberty client lower constraints
diff --git a/tox.ini b/tox.ini
index 7cd330f3..f8a178c6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ setenv = VIRTUAL_ENV={envdir}
          AMULET_SETUP_TIMEOUT=5400
 install_command =
   pip install {opts} {packages}
-commands = ostestr {posargs}
+commands = stestr run {posargs}
 whitelist_externals = juju
 passenv = HOME TERM AMULET_* CS_API_*
 
@@ -49,7 +49,7 @@ setenv =
     PYTHON=coverage run
 commands =
     coverage erase
-    ostestr {posargs}
+    stestr run {posargs}
     coverage combine
     coverage html -d cover
     coverage xml -o cover/coverage.xml