From 5fa99445dc43cb0af8aeed08dd32f803c2329252 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 22 Jun 2012 19:28:20 +0000 Subject: QPID-4078: Fix primary self-connections in long running test. Assert to detect self-connection were triggered in log runs of ha_tests.py test_failover_send_receive. Fix: - HaBroker close backup link before removing broker-info for outgoing link. - HaBroker removes own address from failover addresses. - Link.cpp: Skip ioThreadProcessing and maintenanceVisit on a link that is closed. - Minor improvements to log messages and comments. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1352999 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/ha_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/src/tests') diff --git a/qpid/cpp/src/tests/ha_tests.py b/qpid/cpp/src/tests/ha_tests.py index 7338136bfd..4d07d386f9 100755 --- a/qpid/cpp/src/tests/ha_tests.py +++ b/qpid/cpp/src/tests/ha_tests.py @@ -87,7 +87,7 @@ class HaBroker(Broker): # Ignore ConnectionError, the broker may not be up yet. try: return self.ha_status() == status; except ConnectionError: return False - assert retry(try_get_status, timeout=20), "%s, %r != %r"%(self, self.ha_status(), status) + assert retry(try_get_status, timeout=20), "%s status != %r"%(self, status) # FIXME aconway 2012-05-01: do direct python call to qpid-config code. def qpid_config(self, args): -- cgit v1.2.1