From 6396cbe14c6fdec35ceaa0fa697541ec7da62358 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 4 Jun 2010 15:39:01 +0000 Subject: Fixed sporadic failure of cluster_tests.py sasl_test - added missing initializer for cluster::Connection::inConnectionNegotiation - brokertest.py: fixed formatting of log excerpt in exceptions. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@951452 13f79535-47bb-0310-9956-ffa450edef68 --- python/qpid/brokertest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'python') diff --git a/python/qpid/brokertest.py b/python/qpid/brokertest.py index cd16aa14e0..92a94a8d38 100644 --- a/python/qpid/brokertest.py +++ b/python/qpid/brokertest.py @@ -87,10 +87,10 @@ def error_line(filename, n=1): try: for l in f: if len(result) == n: result.pop(0) - result.append("\n "+l) + result.append(" "+l) finally: f.close() except: return "" - return ":" + "".join(result) + return ":\n" + "".join(result) def retry(function, timeout=10, delay=.01): """Call function until it returns True or timeout expires. @@ -301,7 +301,7 @@ class Broker(Popen): try: self._port = int(self.stdout.readline()) except ValueError: raise Exception("Can't get port for broker %s (%s)%s" % - (self.name, self.pname, error_line(self.log))) + (self.name, self.pname, error_line(self.log,4))) return self._port def unexpected(self,msg): -- cgit v1.2.1