From b4f33ec0c676659d01f5e463e26855afd593815a Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc+taskw@gmail.com>
Date: Mon, 20 Oct 2014 13:29:30 +0100
Subject: [PATCH] Unittest - Replace None by objects representing the state of
 stdout/err

---
 test/basetest/exceptions.py | 13 +++++++++++++
 test/basetest/utils.py      | 11 ++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/test/basetest/exceptions.py b/test/basetest/exceptions.py
index 4c7035803..6191b1d27 100644
--- a/test/basetest/exceptions.py
+++ b/test/basetest/exceptions.py
@@ -32,4 +32,17 @@ class CommandError(Exception):
 class HookError(Exception):
     pass
 
+
+class TimeoutWaitingForStream(object):
+    def __init__(self, name):
+        self.stream = name
+
+    def __repr__(self):
+        return "*** Timeout reached while waiting for %s ***".format(self.name)
+
+
+class StreamsAreMerged(object):
+    def __repr__(self):
+        return "*** Streams are merged, STDERR is not available ***"
+
 # vim: ai sts=4 et sw=4
diff --git a/test/basetest/utils.py b/test/basetest/utils.py
index 5c9164a27..2cc86f5ef 100644
--- a/test/basetest/utils.py
+++ b/test/basetest/utils.py
@@ -13,7 +13,7 @@ try:
     import simplejson as json
 except ImportError:
     import json
-from .exceptions import CommandError
+from .exceptions import CommandError, TimeoutWaitingForStream, StreamsAreMerged
 
 USED_PORTS = set()
 ON_POSIX = 'posix' in sys.builtin_module_names
@@ -106,11 +106,11 @@ def _get_output(proc, input, timeout=None):
     try:
         out = outq.get(timeout=timeout)
     except Empty:
-        out = None
+        out = TimeoutWaitingForStream("stdout")
     try:
         err = errq.get(timeout=timeout)
     except Empty:
-        err = None
+        err = TimeoutWaitingForStream("stderr")
 
     return out, err, exit
 
@@ -133,6 +133,11 @@ def run_cmd_wait(cmd, input=None, stdout=PIPE, stderr=PIPE,
               close_fds=ON_POSIX, env=env)
     out, err, exit = _get_output(p, input, timeout)
 
+    # If streams were merged err should always be None so represent it with a
+    # more informative object
+    if merge_streams:
+        err = StreamsAreMerged()
+
     if exit != 0:
         raise CommandError(cmd, exit, out, err)