diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-29 11:00:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-29 11:00:50 +0000 |
| commit | db56c590e8b0a50e0fc2ee5bf186057a66c90e2e (patch) | |
| tree | 5017c238c63cede2a06de56dad66f3a5d618865e | |
| parent | b3f71fe365beb9b439017f3673a1e0356f87a19d (diff) | |
| parent | e4b85c10a66075a8bd1241e9945843be549aa813 (diff) | |
| download | nova-db56c590e8b0a50e0fc2ee5bf186057a66c90e2e.tar.gz nova-db56c590e8b0a50e0fc2ee5bf186057a66c90e2e.tar.xz nova-db56c590e8b0a50e0fc2ee5bf186057a66c90e2e.zip | |
Merge "Make testr preserve existing OS_* env vars values"
| -rw-r--r-- | .testr.conf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.testr.conf b/.testr.conf index 1036ba0ca..4bc514d62 100644 --- a/.testr.conf +++ b/.testr.conf @@ -1,4 +1,8 @@ [DEFAULT] -test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 ${PYTHON:-python} -m subunit.run discover -t ./ ./nova/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:-60} \ + ${PYTHON:-python} -m subunit.run discover -t ./ ./nova/tests $LISTOPT $IDOPTION + test_id_option=--load-list $IDFILE test_list_option=--list |