From e4b85c10a66075a8bd1241e9945843be549aa813 Mon Sep 17 00:00:00 2001
From: Roman Podolyaka <rpodolyaka@mirantis.com>
Date: Tue, 21 May 2013 13:45:40 +0300
Subject: [PATCH] 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
---
 .testr.conf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.testr.conf b/.testr.conf
index 1036ba0ca0e..4bc514d62b4 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