diff options
| author | Alan Conway <aconway@apache.org> | 2010-06-04 15:39:01 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-06-04 15:39:01 +0000 |
| commit | 6396cbe14c6fdec35ceaa0fa697541ec7da62358 (patch) | |
| tree | bb521f1243ccdd6b7e5d69ef676f390a387de9ca | |
| parent | fdbf2377d6604a9c78764f213e86d49db6b29a8a (diff) | |
| download | qpid-python-6396cbe14c6fdec35ceaa0fa697541ec7da62358.tar.gz | |
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
| -rw-r--r-- | cpp/src/qpid/cluster/Connection.cpp | 3 | ||||
| -rw-r--r-- | python/qpid/brokertest.py | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/qpid/cluster/Connection.cpp b/cpp/src/qpid/cluster/Connection.cpp index 43a47930fd..9a8cab24a6 100644 --- a/cpp/src/qpid/cluster/Connection.cpp +++ b/cpp/src/qpid/cluster/Connection.cpp @@ -108,7 +108,8 @@ Connection::Connection(Cluster& c, sys::ConnectionOutputHandler& out, mcastFrameHandler(cluster.getMulticast(), self), updateIn(c.getUpdateReceiver()), secureConnection(0), - mcastSentButNotReceived(false) + mcastSentButNotReceived(false), + inConnectionNegotiation(true) { cluster.addLocalConnection(this); if (isLocalClient()) { 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): |