Skip to content

Commit 4536b2f

Browse files
liuyaminstmcginnis
authored andcommitted
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
1 parent fbf5a70 commit 4536b2f

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/.*
22
!.gitignore
33
!.mailmap
4-
!.testr.conf
4+
!.stestr.conf
55
.*.sw?
66
subunit.log
77
*,cover

test-requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ mock>=2.0.0 # BSD
1010
requests-mock>=1.2.0 # Apache-2.0
1111
tempest>=17.1.0 # Apache-2.0
1212
testtools>=2.2.0 # MIT
13-
testrepository>=0.0.18 # Apache-2.0/BSD
14-
os-testr>=1.0.0 # Apache-2.0
13+
stestr>=1.0.0 # Apache-2.0
1514
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0

tox.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ deps =
2020
-r{toxinidir}/requirements.txt
2121
-r{toxinidir}/test-requirements.txt
2222
commands = find . -type f -name "*.pyc" -delete
23-
ostestr {posargs}
23+
stestr run '{posargs}'
24+
stestr slowest
2425
whitelist_externals = find
2526

2627
[testenv:pep8]
@@ -69,7 +70,7 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
6970

7071
[testenv:functional]
7172
basepython = python3
72-
commands = ostestr {posargs}
73+
commands = stestr run '{posargs}'
7374
setenv =
7475
{[testenv]setenv}
7576
OS_TEST_PATH = ./cinderclient/tests/functional

0 commit comments

Comments
 (0)