diff options
| author | Alan Conway <aconway@apache.org> | 2011-06-14 20:00:11 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2011-06-14 20:00:11 +0000 |
| commit | 7f39f1fec83ba82b8f6b6732dda393c3b30d0b85 (patch) | |
| tree | a2e9aee617bda27d85398b67ff280647184ea736 | |
| parent | 81470b02dfbc0c4d651df97cd9dd697db072402b (diff) | |
| download | qpid-python-7f39f1fec83ba82b8f6b6732dda393c3b30d0b85.tar.gz | |
NO-JIRA: Removed reconnect-timeout from tests, was causing spurious failures.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1135768 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/tests/brokertest.py | 4 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/cluster_tests.py | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/qpid/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py index 2795af3c5a..538175b525 100644 --- a/qpid/cpp/src/tests/brokertest.py +++ b/qpid/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/qpid/cpp/src/tests/cluster_tests.py b/qpid/cpp/src/tests/cluster_tests.py index 8f20f3cac6..e1ab77bca6 100755 --- a/qpid/cpp/src/tests/cluster_tests.py +++ b/qpid/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()]) |