diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-29 01:13:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-29 01:13:24 +0000 |
| commit | d929069824850a2e0e6299f76d9c85f730401e74 (patch) | |
| tree | 9d510366ddcd08e10abe52e37f99c98296485544 /.testr.conf | |
| parent | f2bb8e433edfaf8cf46d102070c84460d01a73b5 (diff) | |
| parent | 7d48398d4f87ad68698a9c3cd7a8bc2a3c7b1226 (diff) | |
| download | kolla-kilo-eol.tar.gz kolla-kilo-eol.zip | |
Merge "Clean up the image functional test" into stable/kilokilo-eol
Diffstat (limited to '.testr.conf')
| -rw-r--r-- | .testr.conf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.testr.conf b/.testr.conf index cff5dee05..db65e3944 100644 --- a/.testr.conf +++ b/.testr.conf @@ -1,4 +1,7 @@ [DEFAULT] -test_command=python -m subunit.run discover tests $LISTOPT $IDOPTION +test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ + OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ + OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-7200} \ + ${PYTHON:-python} -m subunit.run discover ${OS_TEST_PATH:-./tests} $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list |