Fix testing env variables and testing directory
We still had Nosetests environment variables, although Climate uses testr. Change-Id: I0fe6acc3a954566c9d6e5081bf0a9456774c3729
This commit is contained in:
parent
9b5ad6c5ef
commit
28b9ffbb3f
|
@ -2,6 +2,6 @@
|
||||||
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
|
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
|
||||||
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
|
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
|
||||||
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
|
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_id_option=--load-list $IDFILE
|
||||||
test_list_option=--list
|
test_list_option=--list
|
||||||
|
|
6
tox.ini
6
tox.ini
|
@ -9,11 +9,7 @@ install_command = pip install -U {opts} {packages}
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
NOSE_WITH_OPENSTACK=1
|
DISCOVER_DIRECTORY=climate/tests
|
||||||
NOSE_OPENSTACK_COLOR=1
|
|
||||||
NOSE_OPENSTACK_RED=0.05
|
|
||||||
NOSE_OPENSTACK_YELLOW=0.025
|
|
||||||
NOSE_OPENSTACK_SHOW_ELAPSED=1
|
|
||||||
commands =
|
commands =
|
||||||
python -m climate.openstack.common.lockutils python setup.py testr --slowest --testr-args="{posargs}"
|
python -m climate.openstack.common.lockutils python setup.py testr --slowest --testr-args="{posargs}"
|
||||||
sitepackages = False
|
sitepackages = False
|
||||||
|
|
Loading…
Reference in New Issue