From bfd0ea5b4582f99fe423ec18d206e7f3d2a635dc Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 9 Jun 2010 20:29:32 +0000 Subject: Fix cluster-safe assertion in connection negotiation. See https://bugzilla.redhat.com/show_bug.cgi?id=602347. In a cluster, raise the management connect event when processing cluster.announce. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@953147 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/cluster_tests.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/src/tests') diff --git a/qpid/cpp/src/tests/cluster_tests.py b/qpid/cpp/src/tests/cluster_tests.py index 02b3b29571..3fb184c282 100755 --- a/qpid/cpp/src/tests/cluster_tests.py +++ b/qpid/cpp/src/tests/cluster_tests.py @@ -223,6 +223,7 @@ class LongTests(BrokerTest): """Start ordinary clients for a broker. Start one client per broker. Round-robin on a colllection of different clients.""" cmds=[ + ["qpid-tool", "localhost:%s"%(broker.port())], ["qpid-perftest", "--count", 50000, "--base-name", str(qpid.datatypes.uuid4()), "--port", broker.port()], ["qpid-queue-stats", "-a", "localhost:%s" %(broker.port())], @@ -234,14 +235,15 @@ class LongTests(BrokerTest): cmd = ["qpid-stat", "-b", "localhost:%s" %(broker.port())] mclients.append(ClientLoop(broker, cmd)) - endtime = time.time() + self.duration() + duration = max(self.duration(), 5) + endtime = time.time() + duration alive = 0 # First live cluster member for i in range(len(cluster)): start_clients(cluster[i], i) start_mclients(cluster[alive]) while time.time() < endtime: - time.sleep(min(5,self.duration()/2)) + time.sleep(min(5,duration/2)) for b in cluster[alive:]: b.ready() # Check if a broker crashed. # Kill the first broker, expect the clients to fail. for c in clients[alive] + mclients: c.expect_fail() -- cgit v1.2.1