From e384dca5a1af89daa3e72476b2cd35d043d3a8f7 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 17 Feb 2016 11:30:21 +0100 Subject: [PATCH] .testr.conf: revert workaround of testtools bug Revert the change I6507e693fc929e03884f933bbda241f744d3a7c0. The testtools bug was fixed, the "| cat" workaround is no more needed. Fix for subunit (for testtools), workaround the eventlet bug: https://github.com/testing-cabal/subunit/pull/14 Fix of the root cause in eventlet: https://github.com/eventlet/eventlet/issues/248 The bug was limited to Python 3 and related to non-blocking stdout. Change-Id: I207b7a7e82cbd7e5848231115b3577be7b600638 Related-Bug: 1492505 --- .testr.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.testr.conf b/.testr.conf index 2be9851fb..80e7ea849 100644 --- a/.testr.conf +++ b/.testr.conf @@ -1,4 +1,4 @@ [DEFAULT] -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 ./ . $LISTOPT $IDOPTION | cat +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 ./ . $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list