From 82aa60445c37fff48928e9e40b41ba893abfb788 Mon Sep 17 00:00:00 2001
From: zhurong <aaronzhu1121@gmail.com>
Date: Fri, 3 Aug 2018 12:05:18 +0800
Subject: [PATCH] Using stestr

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

diff --git a/.gitignore b/.gitignore
index 6dfad1977..e813353ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,6 @@ etc/solum/solum.policy.yaml.sample
 
 #User Config file for Solum
 etc/solum/solum.conf
+
+!/.stestr.conf
+.stestr/
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 000000000..7886109ae
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./solum/tests}
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 16061eb3a..000000000
--- a/.testr.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
-             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_LOG_CAPTURE=${OS_LOG_CAPTURE:-1} \
-             OS_DEBUG=${OS_DEBUG:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ ./solum/tests $LISTOPT $IDOPTION
-
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/tox.ini b/tox.ini
index 30aaac2d4..792b70f30 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ whitelist_externals = find
 commands =
     find . -type f -name "*.pyc" -delete
     rm -f .testrepository/times.dbm
-    python setup.py testr --slowest --testr-args='{posargs}'
+    stestr run {posargs}
 
 [testenv:pep8]
 basepython = python3