From 5eaae59450667e039250b44ff4f454881c5e2bed Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Fri, 19 Feb 2016 14:27:40 +0100
Subject: [PATCH] .testr.conf: revert workaround of testtools bug

Revert the change I4c88f1891f53c6559bca71bf657aa30df2101280.
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.

See also the similar change for oslo.messaging:
I207b7a7e82cbd7e5848231115b3577be7b600638.

Change-Id: Iad759af7fbd8a404b7ac361763b27214f3a49ac3
Related-Bug: 1492505
---
 .testr.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.testr.conf b/.testr.conf
index 23c9c5851df..c180b0319fb 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
-test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./neutron/tests/unit} $LISTOPT $IDOPTION | cat
+test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./neutron/tests/unit} $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list