From 3813c99e501a1f67a9cbde751cf71747a61f6786 Mon Sep 17 00:00:00 2001
From: JyotiJauhari <jyotijauhari222@gmail.com>
Date: Fri, 16 Jul 2021 03:18:27 +0530
Subject: [PATCH] Migrate from testr to stestr

* Replace .testr.conf by .stestr.conf for migration and update
  .gitignore and test-requirements.txt file accordingly
* Use py3 as the default runtime for tox
* Add a new job, openstack-cover-jobs, to run the coverage in Zuul
* Use tox version 3.18.0 for using allowlist_externals

Signed-off-by: JyotiJauhari <jyotijauhari222@gmail.com>
Change-Id: Ifd6fc7b0c22919b91fff9eb136de8c023bce3849
---
 .gitignore            |  2 +-
 .stestr.conf          |  3 +++
 .testr.conf           |  7 -------
 test-requirements.txt |  2 +-
 tox.ini               | 18 ++++++++++++++----
 5 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 .stestr.conf
 delete mode 100644 .testr.conf

diff --git a/.gitignore b/.gitignore
index 963e589..3c71a79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,7 @@ cover/
 !.coveragerc
 .tox
 nosetests.xml
-.testrepository
+.stestr
 .venv
 
 # Translations
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..7db9855
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./zaqar_tempest_plugin/tests/
+top_dir=./
\ No newline at end of file
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 6d83b3c..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,7 +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 ./ . $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/test-requirements.txt b/test-requirements.txt
index 93fc72c..d14547f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,5 +7,5 @@ hacking>=3.1.0,<3.2.0 # Apache-2.0
 coverage>=4.0,!=4.4 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
 oslotest>=1.10.0 # Apache-2.0
-testrepository>=0.0.18  # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 testtools>=1.4.0 # MIT
diff --git a/tox.ini b/tox.ini
index af28373..7f123dc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-minversion = 3.1.1
-envlist = py35,pypy,pep8
+minversion = 3.18.0
+envlist = py3,pypy,pep8
 skipsdist = True
 ignore_basepython_conflict = True
 
@@ -14,7 +14,7 @@ deps =
    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
    -r{toxinidir}/requirements.txt
    -r{toxinidir}/test-requirements.txt
-commands = python setup.py test --slowest --testr-args='{posargs}'
+commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
 commands = flake8 {posargs}
@@ -23,7 +23,17 @@ commands = flake8 {posargs}
 commands = {posargs}
 
 [testenv:cover]
-commands = python setup.py test --coverage --testr-args='{posargs}'
+allowlist_externals = find
+setenv = {[testenv]setenv}
+PYTHON=coverage run --source zaqar_tempest_plugin --parallel-mode
+commands =
+  coverage erase
+  find . -type f -name "*.pyc" -delete
+  stestr run {posargs}
+  coverage combine
+  coverage html -d cover
+  coverage xml -o cover/coverage.xml
+  coverage report
 
 [testenv:docs]
 deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}