openstack/python-openstackclient
Code Issues Proposed changes

Merge "Switch to use stestr directly"

Browse Source
This commit is contained in:
Zuul 2017-12-27 20:07:04 +00:00 committed by Gerrit Code Review
commit 5e00034d8e
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstackclient/tests/functional/run_ostestr.sh → openstackclient/tests/functional/run_stestr.sh
View File

@ -13,4 +13,4 @@ fi
echo 'Running tests with:' echo 'Running tests with:'
env | grep OS env | grep OS
ostestr $* stestr run $*

3
test-requirements.txt
View File

@ -15,8 +15,7 @@ requests-mock>=1.1.0 # Apache-2.0
sphinx>=1.6.2 # BSD sphinx>=1.6.2 # BSD
stevedore>=1.20.0 # Apache-2.0 stevedore>=1.20.0 # Apache-2.0
os-client-config>=1.28.0 # Apache-2.0 os-client-config>=1.28.0 # Apache-2.0
os-testr>=1.0.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=2.2.0 # MIT testtools>=2.2.0 # MIT
tempest>=17.1.0 # Apache-2.0 tempest>=17.1.0 # Apache-2.0
osprofiler>=1.4.0 # Apache-2.0 osprofiler>=1.4.0 # Apache-2.0

25
tox.ini
View File

@ -14,8 +14,8 @@ deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
commands = ostestr {posargs} commands = stestr run {posargs}
whitelist_externals = ostestr whitelist_externals = stestr
[testenv:fast8] [testenv:fast8]
# Use same environment directory as pep8 env to save space and install time # Use same environment directory as pep8 env to save space and install time
@ -63,20 +63,20 @@ commands =
pip install -q -U -e "git+file://{toxinidir}/../os-client-config#egg=os_client_config" pip install -q -U -e "git+file://{toxinidir}/../os-client-config#egg=os_client_config"
pip install -q -e "git+file://{toxinidir}/../python-openstacksdk#egg=openstacksdk" pip install -q -e "git+file://{toxinidir}/../python-openstacksdk#egg=openstacksdk"
pip freeze pip freeze
ostestr {posargs} stestr run {posargs}
whitelist_externals = ostestr whitelist_externals = stestr
[testenv:functional] [testenv:functional]
setenv = OS_TEST_PATH=./openstackclient/tests/functional setenv = OS_TEST_PATH=./openstackclient/tests/functional
passenv = OS_* passenv = OS_*
whitelist_externals = openstackclient/tests/functional/run_ostestr.sh whitelist_externals = openstackclient/tests/functional/run_stestr.sh
commands = commands =
{toxinidir}/openstackclient/tests/functional/run_ostestr.sh {posargs} {toxinidir}/openstackclient/tests/functional/run_stestr.sh {posargs}
[testenv:functional-tips] [testenv:functional-tips]
setenv = OS_TEST_PATH=./openstackclient/tests/functional setenv = OS_TEST_PATH=./openstackclient/tests/functional
passenv = OS_* passenv = OS_*
whitelist_externals = openstackclient/tests/functional/run_ostestr.sh whitelist_externals = openstackclient/tests/functional/run_stestr.sh
commands = commands =
pip install -q -U -e "git+file://{toxinidir}/../cliff#egg=cliff" pip install -q -U -e "git+file://{toxinidir}/../cliff#egg=cliff"
pip install -q -U -e "git+file://{toxinidir}/../keystoneauth#egg=keystoneauth" pip install -q -U -e "git+file://{toxinidir}/../keystoneauth#egg=keystoneauth"
@ -84,15 +84,20 @@ commands =
pip install -q -U -e "git+file://{toxinidir}/../os-client-config#egg=os_client_config" pip install -q -U -e "git+file://{toxinidir}/../os-client-config#egg=os_client_config"
pip install -q -U -e "git+file://{toxinidir}/../python-openstacksdk#egg=openstacksdk" pip install -q -U -e "git+file://{toxinidir}/../python-openstacksdk#egg=openstacksdk"
pip freeze pip freeze
{toxinidir}/openstackclient/tests/functional/run_ostestr.sh {posargs} {toxinidir}/openstackclient/tests/functional/run_stestr.sh {posargs}
[testenv:venv] [testenv:venv]
commands = {posargs} commands = {posargs}
[testenv:cover] [testenv:cover]
setenv =
VIRTUAL_ENV={envdir}
PYTHON=coverage run --source openstackclient --parallel-mode
commands = commands =
python setup.py test --coverage --testr-args='{posargs}' stestr -q run {posargs}
coverage report coverage combine
coverage html -d cover
coverage xml -o cover/coverage.xml
[testenv:debug] [testenv:debug]
passenv = OS_* passenv = OS_*