From 28b9ffbb3fa064631abeba47bed2ba0681437b8c Mon Sep 17 00:00:00 2001 From: Dina Belova Date: Tue, 28 Jan 2014 14:25:35 +0400 Subject: [PATCH] Fix testing env variables and testing directory We still had Nosetests environment variables, although Climate uses testr. Change-Id: I0fe6acc3a954566c9d6e5081bf0a9456774c3729 --- .testr.conf | 2 +- tox.ini | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.testr.conf b/.testr.conf index 1c480b9f..4da4d7db 100644 --- a/.testr.conf +++ b/.testr.conf @@ -2,6 +2,6 @@ test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \ - ${PYTHON:-python} -m subunit.run discover climate $LISTOPT $IDOPTION + ${PYTHON:-python} -m subunit.run discover $DISCOVER_DIRECTORY $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list diff --git a/tox.ini b/tox.ini index 5cf77b53..7107bc7b 100644 --- a/tox.ini +++ b/tox.ini @@ -9,11 +9,7 @@ install_command = pip install -U {opts} {packages} deps = -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt setenv = VIRTUAL_ENV={envdir} - NOSE_WITH_OPENSTACK=1 - NOSE_OPENSTACK_COLOR=1 - NOSE_OPENSTACK_RED=0.05 - NOSE_OPENSTACK_YELLOW=0.025 - NOSE_OPENSTACK_SHOW_ELAPSED=1 + DISCOVER_DIRECTORY=climate/tests commands = python -m climate.openstack.common.lockutils python setup.py testr --slowest --testr-args="{posargs}" sitepackages = False