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
This commit is contained in:
liuyamin 2018-05-28 09:05:20 +08:00 committed by Sean McGinnis
parent fbf5a70dd1
commit 4536b2fb9f
3 changed files with 5 additions and 5 deletions

2
.gitignore vendored
View File

@ -1,7 +1,7 @@
/.* /.*
!.gitignore !.gitignore
!.mailmap !.mailmap
!.testr.conf !.stestr.conf
.*.sw? .*.sw?
subunit.log subunit.log
*,cover *,cover

View File

@ -10,6 +10,5 @@ mock>=2.0.0 # BSD
requests-mock>=1.2.0 # Apache-2.0 requests-mock>=1.2.0 # Apache-2.0
tempest>=17.1.0 # Apache-2.0 tempest>=17.1.0 # Apache-2.0
testtools>=2.2.0 # MIT testtools>=2.2.0 # MIT
testrepository>=0.0.18 # Apache-2.0/BSD stestr>=1.0.0 # Apache-2.0
os-testr>=1.0.0 # Apache-2.0
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0

View File

@ -20,7 +20,8 @@ deps =
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = find . -type f -name "*.pyc" -delete commands = find . -type f -name "*.pyc" -delete
ostestr {posargs} stestr run '{posargs}'
stestr slowest
whitelist_externals = find whitelist_externals = find
[testenv:pep8] [testenv:pep8]
@ -69,7 +70,7 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
[testenv:functional] [testenv:functional]
basepython = python3 basepython = python3
commands = ostestr {posargs} commands = stestr run '{posargs}'
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}
OS_TEST_PATH = ./cinderclient/tests/functional OS_TEST_PATH = ./cinderclient/tests/functional