Merge "Switch to using stestr"

This commit is contained in:
Zuul 2018-06-07 15:02:32 +00:00 committed by Gerrit Code Review
commit 03e7b935a2
4 changed files with 5 additions and 4 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ etc/
kolla_cli.egg-info/* kolla_cli.egg-info/*
.testrepository .testrepository
.mypy_cache/* .mypy_cache/*
.stestr

View File

@ -16,4 +16,4 @@ export KOLLA_TOOLS_DIR=./tools/
Then you can run a single test, for eg: Then you can run a single test, for eg:
source .tox/functional/bin/activate source .tox/functional/bin/activate
ostestr -n kolla_cli.tests.functional.test_deploy.TestFunctional.test_deploy stestr run -n kolla_cli.tests.functional.test_deploy.TestFunctional.test_deploy

View File

@ -11,7 +11,7 @@ fixtures>=0.3.14
mock>=1.0 mock>=1.0
mypy>=0.6; python_version>'2.7' mypy>=0.6; python_version>'2.7'
oslo.utils>=3.33.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0
os-testr>=1.0.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0
pexpect>=4.0.1 pexpect>=4.0.1
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
sphinxcontrib-pecanwsme>=0.8 sphinxcontrib-pecanwsme>=0.8

View File

@ -18,7 +18,7 @@ commands =
find . -type d -name "__pycache__" -delete find . -type d -name "__pycache__" -delete
[testenv:py27] [testenv:py27]
commands = ostestr {posargs} commands = stestr run {posargs}
[testenv:functional] [testenv:functional]
whitelist_externals = whitelist_externals =
@ -33,7 +33,7 @@ commands =
{[testenv]commands} {[testenv]commands}
{toxinidir}/kolla_cli/tests/functional/functional_test_setup.sh {toxinidir}/kolla_cli/tests/functional/functional_test_setup.sh
bash -c "pushd /tmp/kollaclitest/usr/share/kolla-ansible/git; python setup.py install; popd" bash -c "pushd /tmp/kollaclitest/usr/share/kolla-ansible/git; python setup.py install; popd"
ostestr {posargs} --serial stestr run {posargs} --serial
[testenv:functional-py35] [testenv:functional-py35]
basepython = py35: python3.5 basepython = py35: python3.5