openstack/ceilometer
Code Issues Proposed changes

Merge "tox: Remove useless env"

Browse Source
This commit is contained in:
Jenkins
2016-09-15 23:39:52 +00:00
committed by Gerrit Code Review
parent caeb661d8a 56855f2c92
commit 8263624d40
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tox.ini
View File

@@ -35,31 +35,27 @@ setenv = OS_TEST_PATH=ceilometer/tests/functional/
commands = pifpaf run elasticsearch {toxinidir}/tools/pretty_tox.sh "{posargs}"
[testenv:functional]
setenv = VIRTUAL_ENV={envdir}
OS_TEST_PATH=ceilometer/tests/functional/
setenv = OS_TEST_PATH=ceilometer/tests/functional/
passenv = CEILOMETER_*
commands =
bash -x {toxinidir}/run-functional-tests.sh "{posargs}"
[testenv:py34-functional]
setenv = VIRTUAL_ENV={envdir}
OS_TEST_PATH=ceilometer/tests/functional/
setenv = OS_TEST_PATH=ceilometer/tests/functional/
basepython = python3.4
passenv = CEILOMETER_*
commands =
bash -x {toxinidir}/run-functional-tests.sh "{posargs}"
[testenv:py35-functional]
setenv = VIRTUAL_ENV={envdir}
OS_TEST_PATH=ceilometer/tests/functional/
setenv = OS_TEST_PATH=ceilometer/tests/functional/
basepython = python3.5
passenv = CEILOMETER_*
commands =
bash -x {toxinidir}/run-functional-tests.sh "{posargs}"
[testenv:integration]
setenv = VIRTUAL_ENV={envdir}
OS_TEST_PATH=./ceilometer/tests/integration
setenv = OS_TEST_PATH=./ceilometer/tests/integration
OS_TEST_TIMEOUT=2400
GABBI_LIVE_FAIL_IF_NO_TEST=1
passenv = {[testenv]passenv} HEAT_* CEILOMETER_* GNOCCHI_* AODH_* GLANCE_* NOVA_* ADMIN_*