From 4536b2fb9f8d896fc5b46bd5cfe7ca19167ce5bc Mon Sep 17 00:00:00 2001
From: liuyamin <liuyamin@fiberhome.com>
Date: Mon, 28 May 2018 09:05:20 +0800
Subject: [PATCH] Switch from ostestr to stestr

os-testr has moved over to use stestr instead of testr. This change
updates the tox.ini file to call stestr directly instead of going
through ostestr and remove testrepository from test-requirements.txt.

Change-Id: I31fa5fefd610ec783471e15992675bd39ff0ebc4
---
 .gitignore            | 2 +-
 test-requirements.txt | 3 +--
 tox.ini               | 5 +++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0f9c21e45..92d89273c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 /.*
 !.gitignore
 !.mailmap
-!.testr.conf
+!.stestr.conf
 .*.sw?
 subunit.log
 *,cover
diff --git a/test-requirements.txt b/test-requirements.txt
index 23f0ee213..e16fdd596 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,6 +10,5 @@ mock>=2.0.0 # BSD
 requests-mock>=1.2.0 # Apache-2.0
 tempest>=17.1.0 # Apache-2.0
 testtools>=2.2.0 # MIT
-testrepository>=0.0.18 # Apache-2.0/BSD
-os-testr>=1.0.0 # Apache-2.0
+stestr>=1.0.0 # Apache-2.0
 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 33077032f..58c33c1ce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,7 +20,8 @@ deps =
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = find . -type f -name "*.pyc" -delete
-           ostestr {posargs}
+           stestr run '{posargs}'
+           stestr slowest
 whitelist_externals = find
 
 [testenv:pep8]
@@ -69,7 +70,7 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
 
 [testenv:functional]
 basepython = python3
-commands = ostestr {posargs}
+commands = stestr run '{posargs}'
 setenv =
   {[testenv]setenv}
   OS_TEST_PATH = ./cinderclient/tests/functional