You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2010/06/04 17:39:02 UTC
svn commit: r951452 - in /qpid/trunk/qpid:
cpp/src/qpid/cluster/Connection.cpp python/qpid/brokertest.py
Author: aconway
Date: Fri Jun 4 15:39:01 2010
New Revision: 951452
URL: http://svn.apache.org/viewvc?rev=951452&view=rev
Log:
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.
Modified:
qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp
qpid/trunk/qpid/python/qpid/brokertest.py
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp?rev=951452&r1=951451&r2=951452&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp Fri Jun 4 15:39:01 2010
@@ -108,7 +108,8 @@ Connection::Connection(Cluster& c, sys::
mcastFrameHandler(cluster.getMulticast(), self),
updateIn(c.getUpdateReceiver()),
secureConnection(0),
- mcastSentButNotReceived(false)
+ mcastSentButNotReceived(false),
+ inConnectionNegotiation(true)
{
cluster.addLocalConnection(this);
if (isLocalClient()) {
Modified: qpid/trunk/qpid/python/qpid/brokertest.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/brokertest.py?rev=951452&r1=951451&r2=951452&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/brokertest.py (original)
+++ qpid/trunk/qpid/python/qpid/brokertest.py Fri Jun 4 15:39:01 2010
@@ -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):
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org