From 69c89432fd5ef0f4ca0c4686502f2979e72ae18f Mon Sep 17 00:00:00 2001
From: HeroicHitesh <email.hiteshkumar@gmail.com>
Date: Sun, 4 Jul 2021 20:57:44 +0530
Subject: [PATCH] Migrate from testr to stestr

* Replace .testr.conf by .stestr.conf for migration and update
  .gitignore, tox.ini and requirements.txt files accordingly

Signed-off-by: HeroicHitesh <email.hiteshkumar@gmail.com>
Change-Id: I3eef3b3b27a7fbd2092457c34da8e3bbe7cbf0d5
---
 .gitignore       | 14 +++++++++++---
 .stestr.conf     |  3 +++
 .testr.conf      |  4 ----
 requirements.txt |  2 +-
 tox.ini          |  2 +-
 5 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 .stestr.conf
 delete mode 100644 .testr.conf

diff --git a/.gitignore b/.gitignore
index 53be162..b2442b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,15 @@
-.testrepository
-doc/build
-*.egg-info
 *.pyc
+
+# Packages
+*.egg-info
+
+# Unit test / coverage reports
 .tox
+.stestr
+
+# Sphinx
+doc/build
+
+# pbr generates these
 AUTHORS
 ChangeLog
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..c2c8a3a
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./tests/
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 1287079..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-test_command=${PYTHON:-python} -m subunit.run discover tests $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/requirements.txt b/requirements.txt
index 0505f55..60e6686 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 sphinx>=2.0.0,!=2.1.0 # BSD
 openstackdocstheme>=2.2.1 # Apache-2.0
-testrepository>=0.0.18
+stestr>=2.0.0 # Apache-2.0
 testtools>=0.9.34
 yasfb>=0.5.1
diff --git a/tox.ini b/tox.ini
index ea21a59..1eea7a8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
 # NOTE(tonyb): This project has chosen to *NOT* consume upper-constraints.txt
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+commands = stestr run --slowest {posargs}
 
 [testenv:venv]
 commands = {posargs}