Split functional and py27 tests
Moved tests/extensions to tests/unit/extensions, otherwise they wouldn't have run. Renamed the files in tests/unit/extensions to be prefixed with 'test_', to match the rest of the test files. Did a general clean up of tox.ini so we have standard whitespace. Change-Id: I5615bfbf2d6ff4a4bc3e66e71c2472b0d1e3a2d7
This commit is contained in:
parent
f675fd41b5
commit
508b7b67e2
@ -1,4 +1,4 @@
|
||||
[DEFAULT]
|
||||
test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 ${PYTHON:-python} -m subunit.run discover -s ironic_python_agent/tests/ -p "*.py" $LISTOPT $IDOPTION
|
||||
test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./ironic_python_agent/tests} $LISTOPT $IDOPTION
|
||||
test_id_option=--load-list $IDFILE
|
||||
test_list_option=--list
|
||||
|
26
tox.ini
26
tox.ini
@ -1,25 +1,35 @@
|
||||
[tox]
|
||||
minversion = 1.6
|
||||
skipsdist = True
|
||||
envlist = py34,py27,pep8
|
||||
envlist = py34,py27,func,pep8
|
||||
|
||||
[testenv]
|
||||
usedevelop = True
|
||||
install_command = pip install --allow-external -U {opts} {packages}
|
||||
# Define virtualenv directory, port to use for functional testing, and number
|
||||
# of seconds to wait for the agent to come alive during functional testing.
|
||||
setenv =
|
||||
VIRTUAL_ENV={envdir}
|
||||
TEST_PORT=9999
|
||||
IPA_WAIT_TIME=5
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
VIRTUAL_ENV={envdir}
|
||||
OS_TEST_PATH=./ironic_python_agent/tests/unit
|
||||
deps =
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands =
|
||||
python setup.py testr --slowest --testr-args='{posargs:}'
|
||||
|
||||
[tox:jenkins]
|
||||
downloadcache = ~/cache/pip
|
||||
|
||||
[testenv:func]
|
||||
usedevelop = True
|
||||
# Define virtualenv directory, port to use for functional testing, and number
|
||||
# of seconds to wait for the agent to come alive during functional testing.
|
||||
setenv =
|
||||
VIRTUAL_ENV={envdir}
|
||||
OS_TEST_PATH=./ironic_python_agent/tests/functional
|
||||
TEST_PORT=9999
|
||||
IPA_WAIT_TIME=5
|
||||
commands =
|
||||
python setup.py testr --slowest --testr-args='{posargs:}'
|
||||
|
||||
[testenv:pep8]
|
||||
commands =
|
||||
flake8 {posargs:ironic_python_agent imagebuild}
|
||||
|
Loading…
Reference in New Issue
Block a user