From 7224fde0f0d6206136b411276f8ee8bce8749dd1 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 7 Jan 2013 11:03:30 -0800 Subject: Invert test stream capture logic for debugging. Previously the default test behavior was to capture stdout and stderr. Make the new default to not capture stdout and stderr then set .testr.conf to always capture these streams when running tests under testr. The motiviation behind this change is that you will want these streams to be captured when running under testr, but when not running under testr you may not want to capture them. An example of this would be running `python -m testtools.run test_name` with a change to test_name to invoke the python debugger (capturing stdout and stderr interferes with normal debugger functionality). Also, only invoke the test timeout by default when running under testr. This is done for the same reason as above. When running a test under the debugger the timeout interferes with debugging. Change-Id: I42cbbdadb2f221ec439e92a6800d14e8436bb77b --- .testr.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.testr.conf') diff --git a/.testr.conf b/.testr.conf index fd9442349..1036ba0ca 100644 --- a/.testr.conf +++ b/.testr.conf @@ -1,4 +1,4 @@ [DEFAULT] -test_command=${PYTHON:-python} -m subunit.run discover -t ./ ./nova/tests $LISTOPT $IDOPTION +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_id_option=--load-list $IDFILE test_list_option=--list -- cgit