Merge "Switch tox unit test command to use ostestr"

This commit is contained in:
Jenkins 2016-04-10 20:56:23 +00:00 committed by Gerrit Code Review
commit 291515b14b
2 changed files with 4 additions and 8 deletions

@ -5,10 +5,10 @@ hacking<0.11,>=0.10.0
coverage>=3.6 # Apache-2.0 coverage>=3.6 # Apache-2.0
discover # BSD discover # BSD
mock>=1.2 # BSD mock>=1.2 # BSD
testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=1.4.0 # MIT testtools>=1.4.0 # MIT
python-subunit>=0.0.18 # Apache-2.0/BSD python-subunit>=0.0.18 # Apache-2.0/BSD
oslotest>=1.10.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0
os-testr>=0.4.1 # Apache-2.0
# Doc requirements # Doc requirements
doc8 # Apache-2.0 doc8 # Apache-2.0

10
tox.ini

@ -9,11 +9,8 @@ install_command = pip install --allow-external -U {opts} {packages}
setenv = setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
OS_TEST_PATH=./ironic_python_agent/tests/unit OS_TEST_PATH=./ironic_python_agent/tests/unit
deps = deps = -r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt commands = ostestr {posargs}
-r{toxinidir}/test-requirements.txt
commands =
python setup.py testr --slowest --testr-args='{posargs:}'
[testenv:func] [testenv:func]
usedevelop = True usedevelop = True
@ -24,8 +21,7 @@ setenv =
OS_TEST_PATH=./ironic_python_agent/tests/functional OS_TEST_PATH=./ironic_python_agent/tests/functional
TEST_PORT=9999 TEST_PORT=9999
IPA_WAIT_TRIES=100 IPA_WAIT_TRIES=100
commands = commands = ostestr {posargs}
python setup.py testr --slowest --testr-args='{posargs:}'
[testenv:pep8] [testenv:pep8]
commands = commands =