From 733b901467dfffcbb997009b09afdc41424e78ed Mon Sep 17 00:00:00 2001
From: Pete Vander Giessen <pete.vandergiessen@canonical.com>
Date: Thu, 7 Mar 2019 17:11:11 -0500
Subject: [PATCH] Replace ostestr with stestr in testing framework.

A system upgrade broke ostestr. We can fix it by just calling stestr
directly.

Change-Id: I354d5729a267721c347bf44db55d3d18c9931e7e
---
 .testr.conf           | 8 --------
 test-requirements.txt | 2 +-
 tox.ini               | 4 ++--
 3 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 .testr.conf

diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 801646bb..00000000
--- a/.testr.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
-             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ ./unit_tests $LISTOPT $IDOPTION
-
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/test-requirements.txt b/test-requirements.txt
index 2b2c0e11..272ce1da 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>=2.2.0
 requests>=2.18.4
 # BEGIN: Amulet OpenStack Charm Helper Requirements
 # Liberty client lower constraints
diff --git a/tox.ini b/tox.ini
index f608acc3..c908c19a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,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_*
 
@@ -51,7 +51,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