diff options
| author | Roman Podolyaka <rpodolyaka@mirantis.com> | 2013-05-21 13:45:40 +0300 |
|---|---|---|
| committer | Roman Podolyaka <rpodolyaka@mirantis.com> | 2013-05-29 11:55:49 +0300 |
| commit | e4b85c10a66075a8bd1241e9945843be549aa813 (patch) | |
| tree | 8c1ad30e2d4faebd9c297bd8d5bac3e0b6ff5fa3 /.testr.conf | |
| parent | 64b234d5cb69fbfd183d74f20d7b243569f6c6f6 (diff) | |
| download | nova-e4b85c10a66075a8bd1241e9945843be549aa813.tar.gz nova-e4b85c10a66075a8bd1241e9945843be549aa813.tar.xz nova-e4b85c10a66075a8bd1241e9945843be549aa813.zip | |
Make testr preserve existing OS_* env vars values
Values for OS_TEST_TIMEOUT, OS_STDOUT_CAPTURE and OS_STDERR_CAPTURE
environment variables are fixed in .testr.conf now. It should be possible
to override them for each tox/runtests.sh call or for the current shell
session without making changes to .testr.conf.
Fixes bug 1182416.
Change-Id: I6c7839fa78b53ac8ea358ce0143a00931da96a9e
Diffstat (limited to '.testr.conf')
| -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 |