From 3e203b25854ac86ea476cdff27f17c685e5e2b1c Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Mon, 2 Nov 2015 15:22:10 +0100 Subject: [PATCH] tox: use pretty_tox in most places Change-Id: I005a31938107177058481ead225ffc30197588b5 --- tox.ini | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tox.ini b/tox.ini index bae3bf8e..7d4fa9f5 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ setenv = VIRTUAL_ENV={envdir} OS_TEST_PATH=ceilometer/tests/unit passenv = OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE 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 whitelist_externals = bash @@ -24,23 +24,23 @@ whitelist_externals = bash [testenv:py-mongodb] setenv = OS_TEST_PATH=ceilometer/tests/functional/ 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] setenv = OS_TEST_PATH=ceilometer/tests/functional/ 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] setenv = OS_TEST_PATH=ceilometer/tests/functional/ 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 [testenv:py-elastic] setenv = OS_TEST_PATH=ceilometer/tests/functional/ 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] setenv = VIRTUAL_ENV={envdir} @@ -80,8 +80,7 @@ commands = setenv = OS_TEST_PATH=ceilometer/tests/functional/gabbi passenv = CEILOMETER_* commands = - bash -x {toxinidir}/setup-test-env-mongodb.sh \ - python setup.py testr --testr-args="{posargs}" + bash -x {toxinidir}/setup-test-env-mongodb.sh {toxinidir}/tools/pretty_tox.sh "{posargs}" [testenv:cover] setenv = OS_TEST_PATH=ceilometer/tests