diff options
| author | Adam Gandelman <adamg@ubuntu.com> | 2014-03-30 16:14:16 -0700 |
|---|---|---|
| committer | Adam Gandelman <adamg@ubuntu.com> | 2014-04-04 14:36:02 -0700 |
| commit | a61985324aa1b42dfce637d8b57f08c6569e23f4 (patch) | |
| tree | 3775878a64c2554d0e0624e80a3afa6eb27bea07 /.testr.conf | |
| parent | 32b24fa8fdeae82e0cd5f796780c5ba9906c4580 (diff) | |
| download | ironic-a61985324aa1b42dfce637d8b57f08c6569e23f4.tar.gz | |
Update tox.ini to also run nova tests
This updates testr.conf to allow passing of the tests directory as an
environment variable (defaulting to ironic/tests/). Also updates tox.ini
to run testr once for ironic/tests and once for ironic/nova/tests/, then
combine subunit output.
test-requirements.txt is updated to pull in Nova from a tarball, as well
as mox and python-ironicclient.
Updates the existing Nova driver unit tests to account for recent
refactoring and changes in the Nova virt API.
Change-Id: Ibefa2e0d3f97512f4da9ace780703fe47467232e
Closes-bug: #1299312
Diffstat (limited to '.testr.conf')
| -rw-r--r-- | .testr.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.testr.conf b/.testr.conf index 6c1541ea7..1a61078d7 100644 --- a/.testr.conf +++ b/.testr.conf @@ -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 -t ./ ./ $LISTOPT $IDOPTION +test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 ${PYTHON:-python} -m subunit.run discover -t ./ ${TESTS_DIR:-./ironic/tests/} $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list |