From 317db546667592c5ebbd2249b775ff32f16a5b13 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Mon, 8 Jun 2015 15:23:56 +1200
Subject: Revamp timeout handling and test logging

---
 test/tutils.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'test/tutils.py')

diff --git a/test/tutils.py b/test/tutils.py
index 1e33dfe7..5988e846 100644
--- a/test/tutils.py
+++ b/test/tutils.py
@@ -75,13 +75,17 @@ class DaemonTests(object):
         ssl=None,
         ws_read_limit=None
     ):
+        """
+            Returns a (messages, text log) tuple.
+        """
         if ssl is None:
             ssl = self.ssl
+        logfp = cStringIO.StringIO()
         c = pathoc.Pathoc(
             ("localhost", self.d.port),
             ssl=ssl,
             ws_read_limit=ws_read_limit,
-            fp = None
+            fp = logfp
         )
         c.connect(connect_to)
         if timeout:
@@ -93,7 +97,7 @@ class DaemonTests(object):
                 ret.append(resp)
         for frm in c.wait():
             ret.append(frm)
-        return ret 
+        return ret, logfp.getvalue()
 
 @contextmanager
 def tmpdir(*args, **kwargs):
-- 
cgit v1.2.3