From 2e110ee65983c6d681ab400554a46df5d3ed67a1 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Tue, 14 Jun 2011 20:00:11 +0000
Subject: NO-JIRA: Removed reconnect-timeout from tests, was causing spurious
 failures.

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

(limited to 'cpp/src')

diff --git a/cpp/src/tests/brokertest.py b/cpp/src/tests/brokertest.py
index 2795af3c5a..538175b525 100644
--- a/cpp/src/tests/brokertest.py
+++ b/cpp/src/tests/brokertest.py
@@ -549,7 +549,7 @@ class NumberedSender(Thread):
              "--broker", "localhost:%s"%broker.port(),
              "--address", "%s;{create:always}"%queue,
              "--failover-updates",
-             "--connection-options", "{reconnect:true,reconnect-timeout:10}",
+             "--connection-options", "{reconnect:true}",
              "--content-stdin"
              ],
             expect=EXPECT_RUNNING,
@@ -611,7 +611,7 @@ class NumberedReceiver(Thread):
              "--broker", "localhost:%s"%broker.port(),
              "--address", "%s;{create:always}"%queue,
              "--failover-updates",
-             "--connection-options", "{reconnect:true,reconnect_timeout:10}",
+             "--connection-options", "{reconnect:true}",
              "--forever"
              ],
             expect=EXPECT_RUNNING,
diff --git a/cpp/src/tests/cluster_tests.py b/cpp/src/tests/cluster_tests.py
index 8f20f3cac6..e1ab77bca6 100755
--- a/cpp/src/tests/cluster_tests.py
+++ b/cpp/src/tests/cluster_tests.py
@@ -307,7 +307,7 @@ acl allow all all
              "--sequence=true",
              "--send-eos=1",
              "--messages=100000",
-             "--connection-options={reconnect:true,reconnect_timeout:10}"
+             "--connection-options={reconnect:true}"
              ])
         self.receiver = self.popen(
             ["qpid-receive",
@@ -315,7 +315,7 @@ acl allow all all
              "--address", queue,
              "--ignore-duplicates",
              "--check-redelivered",
-             "--connection-options={reconnect:true,reconnect_timeout:10}",
+             "--connection-options={reconnect:true}",
              "--forever"
              ])
         time.sleep(1)#give sender enough time to have some messages to replay
@@ -463,7 +463,7 @@ acl allow all all
                                                 "--content-size=%s" % self.size,
                                                 "--messages=%s" % self.count,
                                                 "--failover-updates",
-                                                "--connection-options={reconnect:true,reconnect_timeout:10}",
+                                                "--connection-options={reconnect:true}",
                                                 "--address=%s" % self.queue,
                                                 "--broker=%s" % self.broker.host_port()])
                 self.sender.wait()
@@ -495,7 +495,7 @@ acl allow all all
                                      "--timeout=1",
                                      "--print-content=no",
                                      "--failover-updates",
-                                     "--connection-options={reconnect:true,reconnect_timeout:10}",
+                                     "--connection-options={reconnect:true}",
                                      "--ack-frequency=1",
                                      "--address=flq",
                                      "--broker=%s" % cluster[1].host_port()])
@@ -520,7 +520,7 @@ acl allow all all
                                      "--timeout=1",
                                      "--print-content=no",
                                      "--failover-updates",
-                                     "--connection-options={reconnect:true,reconnect_timeout:10}",
+                                     "--connection-options={reconnect:true}",
                                      "--ack-frequency=1",
                                      "--address=flq",
                                      "--broker=%s" % cluster[2].host_port()])
-- 
cgit v1.2.1