diff options
| author | Alan Conway <aconway@apache.org> | 2012-06-22 19:28:20 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-06-22 19:28:20 +0000 |
| commit | a18bf3fe8d01832f4ed40533293c3ce1c2012720 (patch) | |
| tree | c58996c8166bb63850eedcca585b33e2f501ef87 /cpp/src/tests | |
| parent | 4952afa1c6ce3d6cf0e89125ba20279cccd04931 (diff) | |
| download | qpid-python-a18bf3fe8d01832f4ed40533293c3ce1c2012720.tar.gz | |
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/qpid@1352999 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
| -rwxr-xr-x | cpp/src/tests/ha_tests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/tests/ha_tests.py b/cpp/src/tests/ha_tests.py index 7338136bfd..4d07d386f9 100755 --- a/cpp/src/tests/ha_tests.py +++ b/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): |