diff --git a/run_tests.sh b/run_tests.sh index acd9497741..970da51f42 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -107,12 +107,13 @@ function run_tests { } function run_tests_nose { - NOSE_WITH_OPENSTACK=1 - NOSE_OPENSTACK_COLOR=1 - NOSE_OPENSTACK_RED=15.00 - NOSE_OPENSTACK_YELLOW=3.00 - NOSE_OPENSTACK_SHOW_ELAPSED=1 - NOSE_OPENSTACK_STDOUT=1 + export NOSE_WITH_OPENSTACK=1 + export NOSE_OPENSTACK_COLOR=1 + export NOSE_OPENSTACK_RED=15.00 + export NOSE_OPENSTACK_YELLOW=3.00 + export NOSE_OPENSTACK_SHOW_ELAPSED=1 + export NOSE_OPENSTACK_STDOUT=1 + export TEMPEST_PY26_NOSE_COMPAT=1 if [[ "x$noseargs" =~ "tempest" ]]; then noseargs="$testrargs" else diff --git a/tox.ini b/tox.ini index abc9e42235..ff09b3fd67 100644 --- a/tox.ini +++ b/tox.ini @@ -51,6 +51,7 @@ setenv = VIRTUAL_ENV={envdir} NOSE_OPENSTACK_YELLOW=3 NOSE_OPENSTACK_SHOW_ELAPSED=1 NOSE_OPENSTACK_STDOUT=1 + TEMPEST_PY26_NOSE_COMPAT=1 commands = nosetests --logging-format '%(asctime)-15s %(message)s' --with-xunit -sv --xunit-file=nosetests-full.xml tempest/api tempest/scenario tempest/thirdparty tempest/cli tempest/tests {posargs} @@ -62,6 +63,7 @@ NOSE_WITH_OPENSTACK=1 NOSE_OPENSTACK_YELLOW=3 NOSE_OPENSTACK_SHOW_ELAPSED=1 NOSE_OPENSTACK_STDOUT=1 + TEMPEST_PY26_NOSE_COMPAT=1 commands = nosetests --logging-format '%(asctime)-15s %(message)s' --with-xunit -sv --attr=type=smoke --xunit-file=nosetests-smoke.xml tempest {posargs}