From 9fbb2054acea9730638fb1c4a888476035aa95f5 Mon Sep 17 00:00:00 2001
From: Jorge Niedbalski <jorge.niedbalski@canonical.com>
Date: Tue, 4 Jun 2019 11:58:08 -0400
Subject: [PATCH] Switch to stestr.

CI is broken due to a bug [0] reported
in testr.

Following approach used in keystone and switching
to stestr instead of testr.

[0] https://review.opendev.org/#/c/662582/
[1] https://github.com/openstack/charm-keystone/commit/d1e3a7845dc97a634fc419d15e1692858c04589e

Change-Id: I108b4d7b4c4f20f4b077077528f07f9447747a48
Signed-off-by: Jorge Niedbalski <jorge.niedbalski@canonical.com>
---
 .stestr.conf          | 3 +++
 .testr.conf           | 8 --------
 test-requirements.txt | 2 +-
 tox.ini               | 6 +++---
 4 files changed, 7 insertions(+), 12 deletions(-)
 create mode 100644 .stestr.conf
 delete mode 100644 .testr.conf

diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..ee4526b
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./unit_tests
+top_dir=./
\ No newline at end of file
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/test-requirements.txt b/test-requirements.txt
index c706224..27e31e3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,6 +1,6 @@
 # Lint and unit test requirements
 flake8
-os-testr>=0.4.1
+stestr>=2.2.0
 charms.reactive
 mock>=1.2
 coverage>=3.6
diff --git a/tox.ini b/tox.ini
index 6342c7b..10987a2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,12 +13,12 @@ install_command =
 [testenv:py35]
 basepython = python3
 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
@@ -35,7 +35,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