From 3c5045218bcfdca4246db4d9f91e79397d126c23 Mon Sep 17 00:00:00 2001
From: Vu Cong Tuan <tuanvc@vn.fujitsu.com>
Date: Wed, 4 Jul 2018 13:54:37 +0700
Subject: [PATCH] Switch to stestr

According to Openstack summit session [1],
stestr is maintained project to which all Openstack projects should migrate.
Let's switch to stestr as other projects have already moved to it.

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

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

diff --git a/.gitignore b/.gitignore
index 76e9937..965030c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,6 @@ build
 *.swp
 *.swo
 *.pyc
-.testrepository
+.stestr/
 #IntelJ Idea
-.idea/
\ No newline at end of file
+.idea/
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..62b437e
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=${TEST_PATH:-./vitrage_specs/tests}
+top_dir=./
+
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 8819686..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 tests $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 e50640a..785979e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@
 pbr<2.0,>=0.11
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 graphviz>=0.4,!=0.5.0  # MIT License
-testrepository>=0.0.18
+stestr>=2.0.0
 testtools>=0.9.34
 yasfb
 sphinx-autobuild
diff --git a/tox.ini b/tox.ini
index 61191c3..f1c4726 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}