From c45ee73853cb7c84bb2a7dd0c7f9fdecd7aa9286 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Mon, 18 Jun 2012 20:43:19 +0000
Subject: QPID-4072: HA use backup messages in failover.

ReplicatingSubscription syncs the primary and backup queues, and does not
re-send messages that are already on the backup.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1351481 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/tests/brokertest.py | 5 +++--
 qpid/cpp/src/tests/ha_tests.py   | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'qpid/cpp/src/tests')

diff --git a/qpid/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py
index b8b642c504..aea4460e5a 100644
--- a/qpid/cpp/src/tests/brokertest.py
+++ b/qpid/cpp/src/tests/brokertest.py
@@ -572,7 +572,7 @@ class NumberedSender(Thread):
         """
         Thread.__init__(self)
         cmd = ["qpid-send",
-             "--broker", url or broker.host_port(),
+               "--broker", url or broker.host_port(),
                "--address", "%s;{create:always}"%queue,
                "--connection-options", "{%s}"%(connection_options),
                "--content-stdin"
@@ -647,6 +647,7 @@ class NumberedReceiver(Thread):
         self.error = None
         self.sender = sender
         self.received = 0
+        self.queue = queue
 
     def read_message(self):
         n = int(self.receiver.stdout.readline())
@@ -657,7 +658,7 @@ class NumberedReceiver(Thread):
             m = self.read_message()
             while m != -1:
                 self.receiver.assert_running()
-                assert m <= self.received, "%s missing message %s>%s"%(queue, m, self.received)
+                assert m <= self.received, "%s missing message %s>%s"%(self.queue, m, self.received)
                 if (m == self.received): # Ignore duplicates
                     self.received += 1
                     if self.sender:
diff --git a/qpid/cpp/src/tests/ha_tests.py b/qpid/cpp/src/tests/ha_tests.py
index e5a204d03c..7338136bfd 100755
--- a/qpid/cpp/src/tests/ha_tests.py
+++ b/qpid/cpp/src/tests/ha_tests.py
@@ -729,7 +729,7 @@ class LongTests(BrokerTest):
         brokers = HaCluster(self, 3)
 
         # Start sender and receiver threads
-        n = 10;
+        n = 10
         senders = [NumberedSender(brokers[0], max_depth=1024, failover_updates=False,
                                  queue="test%s"%(i)) for i in xrange(n)]
         receivers = [NumberedReceiver(brokers[0], sender=senders[i],
@@ -760,8 +760,7 @@ class LongTests(BrokerTest):
                 def enough():        # Verify we're still running
                     receivers[0].check() # Verify no exceptions
                     return receivers[0].received > n + 100
-                # FIXME aconway 2012-05-17: client reconnect sometimes takes > 1 sec.
-                assert retry(enough, 10), "Stalled: %s < %s+100"%(receivers[0].received, n)
+                assert retry(enough), "Stalled: %s < %s+100"%(receivers[0].received, n)
         except:
             traceback.print_exc()
             raise
-- 
cgit v1.2.1