Merge "Change tox default targets for quick use"

This commit is contained in:
Jenkins 2015-09-04 19:19:03 +00:00 committed by Gerrit Code Review
commit 4fcb80c8ee

View File

@ -1,7 +1,7 @@
[tox] [tox]
minversion = 1.6 minversion = 1.6
skipsdist = True skipsdist = True
envlist = py27,py34,py-mysql,py-pgsql,pep8 envlist = py27,py34,functional,pep8
[testenv] [testenv]
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
@ -61,9 +61,9 @@ commands =
bash -c 'cd ceilometer/tests/integration/gabbi/gabbits-live && gabbi-run -x < autoscaling.yaml' bash -c 'cd ceilometer/tests/integration/gabbi/gabbits-live && gabbi-run -x < autoscaling.yaml'
# bash -x {toxinidir}/tools/pretty_tox.sh "{posargs}" # bash -x {toxinidir}/tools/pretty_tox.sh "{posargs}"
# NOTE(chdent): The gabbi tests are also run under the primary tox # NOTE(chdent): The gabbi tests are also run under the other functional
# targets. This target simply provides a target to directly run just # tox targets. This target simply provides a target to directly run just
# gabbi tests without needing to discovery across the entire body of # gabbi tests without needing to do discovery across the entire body of
# tests. # tests.
[testenv:gabbi] [testenv:gabbi]
setenv = OS_TEST_PATH=ceilometer/tests/functional/gabbi setenv = OS_TEST_PATH=ceilometer/tests/functional/gabbi