From 640bdac0ac2c4a0096c3d9162299ed57271f43ed Mon Sep 17 00:00:00 2001
From: Nguyen Van Trung <trungnv@vn.fujitsu.com>
Date: Mon, 9 Jul 2018 15:15:17 +0700
Subject: [PATCH] Switch to using stestr

According to Openstack summit session [1] stestr is maintained
project to which all Openstack projects should migrate.
Let's switch it then.

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

Change-Id: Ib27496313447cac962e4849223ab9eb96a9d873f
---
 .gitignore            | 3 +++
 .stestr.conf          | 3 +++
 lower-constraints.txt | 2 +-
 test-requirements.txt | 2 +-
 tools/pretty_tox.sh   | 6 ------
 tox.ini               | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 .stestr.conf
 delete mode 100755 tools/pretty_tox.sh

diff --git a/.gitignore b/.gitignore
index 1a80f71c3..7e3e60562 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,9 @@ ChangeLog
 cover
 api-ref/build/
 
+!/.stestr.conf
+.stestr/
+
 #Python
 *.pyc
 
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 000000000..2e0d10ce8
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./murano/tests/unit}
+top_dir=./
diff --git a/lower-constraints.txt b/lower-constraints.txt
index fac47fe21..cff1b2c3b 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -64,7 +64,7 @@ openstacksdk==0.12.0
 os-api-ref==1.4.0
 os-client-config==1.29.0
 os-service-types==1.2.0
-os-testr==1.0.0
+stestr==1.0.0
 osc-lib==1.10.0
 oslo.cache==1.29.0
 oslo.concurrency==3.26.0
diff --git a/test-requirements.txt b/test-requirements.txt
index e0a65791b..f2b2ccf8c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -15,7 +15,7 @@ testscenarios>=0.4 # Apache-2.0/BSD
 unittest2>=1.1.0 # BSD
 pylint==1.4.5 # GPLv2
 requests>=2.14.2 # Apache-2.0
-os-testr>=1.0.0 # Apache-2.0
+stestr>=1.0.0 # Apache-2.0
 murano-pkg-check>=0.3.0 # Apache-2.0
 bandit>=1.1.0 # Apache-2.0
 
diff --git a/tools/pretty_tox.sh b/tools/pretty_tox.sh
deleted file mode 100755
index c5a62e3a4..000000000
--- a/tools/pretty_tox.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -o pipefail
-
-TESTRARGS=$1
-python setup.py testr --slowest --testr-args="--subunit $TESTRARGS" | python $(which subunit-trace) -f
diff --git a/tox.ini b/tox.ini
index 90f1c4303..14caf0617 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = rm -f .testrepository/times.dbm
-           bash tools/pretty_tox.sh '{posargs}'
+           stestr run {posargs}
 whitelist_externals = bash
                       find
                       rm