From 25705e4da37366481e4154e409fe7353fde817bb Mon Sep 17 00:00:00 2001
From: Ha Manh Dong <donghm@vn.fujitsu.com>
Date: Wed, 18 Jul 2018 10:38:17 +0700
Subject: [PATCH] Switch to use stestr for unit test

According to Openstack summit session [1],
stestr is maintained project to which all Openstack projects should migrate.
So we should switch to stestr.

[1] https://etherpad.openstack.org/p/YVR-python-pti

Change-Id: Ib6985475a257570c2df000dfcabb8600afc11f4f
---
 .gitignore       | 4 ++--
 .stestr.conf     | 3 +++
 .testr.conf      | 7 -------
 requirements.txt | 2 +-
 tox.ini          | 2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)
 create mode 100644 .stestr.conf
 delete mode 100644 .testr.conf

diff --git a/.gitignore b/.gitignore
index 1399c981..c19906a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,7 +25,7 @@ pip-log.txt
 .coverage
 .tox
 nosetests.xml
-.testrepository
+.stestr/
 
 # Translations
 *.mo
@@ -48,4 +48,4 @@ ChangeLog
 
 # Editors
 *~
-.*.swp
\ No newline at end of file
+.*.swp
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 00000000..d959b47f
--- /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 fb622677..00000000
--- 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
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 7df18d26..71801c23 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 oslosphinx
 pbr>=0.6,<1.0
 sphinx>=1.1.2,<1.2
-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 f202eec9..eca4d620 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
 install_command = pip install -U {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+commands = stestr run --slowest {posargs}
 
 [testenv:venv]
 commands = {posargs}