From 32a3244bb4879f5c0ea430de6fac284b2a987441 Mon Sep 17 00:00:00 2001
From: Vu Cong Tuan <tuanvc@vn.fujitsu.com>
Date: Thu, 12 Jul 2018 15:23:08 +0700
Subject: 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: I55060b1d99b9a00b20c98fbb429d072568265695
---
 tox.ini | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 852e234f..b3666b18 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,6 @@ usedevelop = True
 # tox is silly... these need to be separated by a newline....
 whitelist_externals =
   find
-  bash
   rm
 passenv = ZUUL_CACHE_DIR
           REQUIREMENTS_PIP_LOCATION
@@ -20,9 +19,7 @@ deps =
   -r{toxinidir}/requirements.txt
 commands =
   find . -type f -name "*.pyc" -delete
-  bash tools/pretty_tox.sh '{posargs}'
-  # there is also secret magic in pretty_tox.sh which lets you run in a fail only
-  # mode. To do this define the TRACE_FAILONLY environmental variable.
+  stestr run {posargs}
 
 [testenv:pep8]
 basepython = python3
@@ -63,26 +60,27 @@ commands =
 [testenv:functional]
 basepython = python2.7
 passenv = OS_NOVACLIENT_TEST_NETWORK
-setenv =
-  OS_TEST_PATH = ./novaclient/tests/functional
 commands =
-  bash tools/pretty_tox.sh '--concurrency=1 {posargs}'
+  stestr --test-path=./novaclient/tests/functional run --concurrency=1 {posargs}
   python novaclient/tests/functional/hooks/check_resources.py
 
 [testenv:functional-py35]
 basepython = python3.5
 passenv = OS_NOVACLIENT_TEST_NETWORK
-setenv =
-  OS_TEST_PATH = ./novaclient/tests/functional
 commands =
-  bash tools/pretty_tox.sh '--concurrency=1 {posargs}'
+  stestr --test-path=./novaclient/tests/functional run --concurrency=1 {posargs}
   python novaclient/tests/functional/hooks/check_resources.py
 
 [testenv:cover]
 basepython = python3
+setenv =
+    PYTHON=coverage run --source novaclient --parallel-mode
 commands =
-  python setup.py testr --coverage --testr-args='{posargs}'
-  coverage report
+    stestr run {posargs}
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
+    coverage report
 
 [flake8]
 # Following checks should be enabled in the future.
-- 
cgit v1.2.1