From 4dfc5158a0724ea6e6696b3a9bd9b80a7b0a4ea0 Mon Sep 17 00:00:00 2001
From: Pete Vander Giessen <pete.vandergiessen@canonical.com>
Date: Thu, 7 Mar 2019 17:13:18 -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: Ib9a1cd1dfc2aac961f61177ee757c7e6a548807f
---
 .stestr.conf              | 3 +++
 .testr.conf               | 8 --------
 src/.stestr.conf          | 1 +
 src/.testr.conf           | 1 -
 src/test-requirements.txt | 2 +-
 test-requirements.txt     | 2 +-
 tox.ini                   | 8 ++++----
 7 files changed, 10 insertions(+), 15 deletions(-)
 create mode 100644 .stestr.conf
 delete mode 100644 .testr.conf
 create mode 120000 src/.stestr.conf
 delete mode 120000 src/.testr.conf

diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..5fcccac
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./unit_tests
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 801646b..0000000
--- 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/src/.stestr.conf b/src/.stestr.conf
new file mode 120000
index 0000000..9347183
--- /dev/null
+++ b/src/.stestr.conf
@@ -0,0 +1 @@
+../.stestr.conf
\ No newline at end of file
diff --git a/src/.testr.conf b/src/.testr.conf
deleted file mode 120000
index 6cf1bfa..0000000
--- a/src/.testr.conf
+++ /dev/null
@@ -1 +0,0 @@
-../.testr.conf
\ No newline at end of file
diff --git a/src/test-requirements.txt b/src/test-requirements.txt
index f013863..e56db9a 100644
--- a/src/test-requirements.txt
+++ b/src/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/test-requirements.txt b/test-requirements.txt
index ca62003..14b380e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,7 +4,7 @@
 #
 # Lint and unit test requirements
 flake8>=2.2.4,<=2.4.1
-os-testr>=0.4.1
+stestr>=2.2.0
 requests>=2.18.4
 charms.reactive
 mock>=1.2
diff --git a/tox.ini b/tox.ini
index 2c6b34f..7a32c66 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,17 +35,17 @@ commands = true
 [testenv:py34]
 basepython = python3.4
 deps = -r{toxinidir}/test-requirements.txt
-commands = ostestr {posargs}
+commands = stestr run {posargs}
 
 [testenv:py35]
 basepython = python3.5
 deps = -r{toxinidir}/test-requirements.txt
-commands = ostestr {posargs}
+commands = stestr run {posargs}
 
 [testenv:py36]
 basepython = python3.6
 deps = -r{toxinidir}/test-requirements.txt
-commands = ostestr {posargs}
+commands = stestr run {posargs}
 
 [testenv:pep8]
 basepython = python3.5
@@ -63,7 +63,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