tox: use pretty_tox in most places

Change-Id: I005a31938107177058481ead225ffc30197588b5
This commit is contained in:
Julien Danjou 2015-11-02 15:22:10 +01:00
parent d26ebcc74b
commit 3e203b2585

13
tox.ini
View File

@ -13,7 +13,7 @@ setenv = VIRTUAL_ENV={envdir}
OS_TEST_PATH=ceilometer/tests/unit OS_TEST_PATH=ceilometer/tests/unit
passenv = OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE passenv = OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE
commands = commands =
python setup.py testr --slowest --testr-args="{posargs}" {toxinidir}/tools/pretty_tox.sh "{posargs}"
oslo-config-generator --config-file=etc/ceilometer/ceilometer-config-generator.conf oslo-config-generator --config-file=etc/ceilometer/ceilometer-config-generator.conf
whitelist_externals = bash whitelist_externals = bash
@ -24,23 +24,23 @@ whitelist_externals = bash
[testenv:py-mongodb] [testenv:py-mongodb]
setenv = OS_TEST_PATH=ceilometer/tests/functional/ setenv = OS_TEST_PATH=ceilometer/tests/functional/
commands = commands =
bash -x {toxinidir}/setup-test-env-mongodb.sh python setup.py testr --slowest --testr-args="{posargs}" bash -x {toxinidir}/setup-test-env-mongodb.sh {toxinidir}/tools/pretty_tox.sh "{posargs}"
[testenv:py-mysql] [testenv:py-mysql]
setenv = OS_TEST_PATH=ceilometer/tests/functional/ setenv = OS_TEST_PATH=ceilometer/tests/functional/
commands = commands =
bash -x {toxinidir}/setup-test-env-mysql.sh python setup.py testr --slowest --testr-args="{posargs}" bash -x {toxinidir}/setup-test-env-mysql.sh {toxinidir}/tools/pretty_tox.sh "{posargs}"
[testenv:py-pgsql] [testenv:py-pgsql]
setenv = OS_TEST_PATH=ceilometer/tests/functional/ setenv = OS_TEST_PATH=ceilometer/tests/functional/
commands = commands =
bash -x {toxinidir}/setup-test-env-postgresql.sh python setup.py testr --slowest --testr-args="{posargs}" bash -x {toxinidir}/setup-test-env-postgresql.sh {toxinidir}/tools/pretty_tox.sh "{posargs}"
# Functional tests for elastic search # Functional tests for elastic search
[testenv:py-elastic] [testenv:py-elastic]
setenv = OS_TEST_PATH=ceilometer/tests/functional/ setenv = OS_TEST_PATH=ceilometer/tests/functional/
commands = commands =
bash -x {toxinidir}/setup-test-env-es.sh python setup.py testr --slowest --testr-args="{posargs}" bash -x {toxinidir}/setup-test-env-es.sh {toxinidir}/tools/pretty_tox.sh "{posargs}"
[testenv:functional] [testenv:functional]
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
@ -80,8 +80,7 @@ commands =
setenv = OS_TEST_PATH=ceilometer/tests/functional/gabbi setenv = OS_TEST_PATH=ceilometer/tests/functional/gabbi
passenv = CEILOMETER_* passenv = CEILOMETER_*
commands = commands =
bash -x {toxinidir}/setup-test-env-mongodb.sh \ bash -x {toxinidir}/setup-test-env-mongodb.sh {toxinidir}/tools/pretty_tox.sh "{posargs}"
python setup.py testr --testr-args="{posargs}"
[testenv:cover] [testenv:cover]
setenv = OS_TEST_PATH=ceilometer/tests setenv = OS_TEST_PATH=ceilometer/tests