summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/ha_tests.py
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/cpp/src/tests/ha_tests.py')
-rwxr-xr-xqpid/cpp/src/tests/ha_tests.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/ha_tests.py b/qpid/cpp/src/tests/ha_tests.py
index ddcc19ee1e..f28b31dd03 100755
--- a/qpid/cpp/src/tests/ha_tests.py
+++ b/qpid/cpp/src/tests/ha_tests.py
@@ -281,12 +281,12 @@ class ShortTests(BrokerTest):
assert retry(lambda: not is_running(primary.pid)) # Wait for primary to die
backup.promote()
n = receiver.received # Make sure we are still running
- assert retry(lambda: receiver.received > n + 10)
+ # FIXME aconway 2012-02-01: c++ client has 1 sec min retry, hence long timeout
+ assert retry(lambda: receiver.received > n + 10, timeout=5)
sender.stop()
receiver.stop()
def test_backup_failover(self):
- # FIXME aconway 2012-01-30: UNFINISHED
brokers = [ HaBroker(self, name=name, expect=EXPECT_EXIT_FAIL)
for name in ["a","b","c"] ]
url = ",".join([b.host_port() for b in brokers])
@@ -300,7 +300,6 @@ class ShortTests(BrokerTest):
brokers[2].promote() # c must fail over to b.
brokers[2].connect().session().sender("q").send("b")
self.assert_browse_backup(brokers[1], "q", ["a","b"])
- # FIXME aconway 2012-01-30: finish
for b in brokers[1:]: b.kill()
if __name__ == "__main__":