diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-04-07 19:55:46 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-04-07 19:55:46 +0000 |
commit | 322d3b42d22cda502a753197c06c607ced9a51ce (patch) | |
tree | 803112d486c5dcad669c49f3c16cd47f0300cab8 /tox.ini | |
parent | 07fa9faaf4e62a988137032b182c23311e792488 (diff) | |
parent | a61985324aa1b42dfce637d8b57f08c6569e23f4 (diff) | |
download | ironic-322d3b42d22cda502a753197c06c607ced9a51ce.tar.gz |
Merge "Update tox.ini to also run nova tests"
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -9,10 +9,11 @@ install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -commands = - python setup.py testr --slowest --testr-args='{posargs}' - whitelist_externals = bash +commands = + bash -c "TESTS_DIR=./ironic/tests/ python setup.py testr --slowest --testr-args='{posargs}'" + bash -c "TESTS_DIR=./ironic/nova/tests/ python setup.py testr --slowest --testr-args='{posargs}'" + bash -c "cat .testrepository/1 >>.testrepository/0" [tox:jenkins] downloadcache = ~/cache/pip @@ -37,7 +38,7 @@ commands = {posargs} ignore = E12,E711 builtins = _ -exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools +exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools,*ironic/nova* [hacking] import_exceptions = ironic.openstack.common.gettextutils._,testtools.matchers |