diff options
| author | Alan Conway <aconway@apache.org> | 2011-06-27 14:32:30 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2011-06-27 14:32:30 +0000 |
| commit | 54ab687c1cde7c801693e133683f63811148d110 (patch) | |
| tree | 32a0b4b738cd79d8153f6c42b15200f42f04ac86 | |
| parent | bd32aa3d7059661b5a506ddf973acaa275dd673e (diff) | |
| download | qpid-python-54ab687c1cde7c801693e133683f63811148d110.tar.gz | |
NO-JIRA: Add reconnect-timeout to test clients to prevent client hangs.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1140179 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 0415a667a2..725bcaabaf 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}", + "--connection-options", "{reconnect:true,reconnect-timeout:5}", "--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}", + "--connection-options", "{reconnect:true,reconnect-timeout:5}", "--forever" ], expect=EXPECT_RUNNING, diff --git a/qpid/cpp/src/tests/cluster_tests.py b/qpid/cpp/src/tests/cluster_tests.py index 18cb4d5c22..97c53e3d97 100755 --- a/qpid/cpp/src/tests/cluster_tests.py +++ b/qpid/cpp/src/tests/cluster_tests.py @@ -314,7 +314,7 @@ acl allow all all "--sequence=true", "--send-eos=1", "--messages=100000", - "--connection-options={reconnect:true}" + "--connection-options={reconnect:true,reconnect-timeout:5}" ]) self.receiver = self.popen( ["qpid-receive", @@ -322,7 +322,7 @@ acl allow all all "--address", queue, "--ignore-duplicates", "--check-redelivered", - "--connection-options={reconnect:true}", + "--connection-options={reconnect:true,reconnect-timeout:5}", "--forever" ]) time.sleep(1)#give sender enough time to have some messages to replay @@ -470,7 +470,7 @@ acl allow all all "--content-size=%s" % self.size, "--messages=%s" % self.count, "--failover-updates", - "--connection-options={reconnect:true}", + "--connection-options={reconnect:true,reconnect-timeout:5}", "--address=%s" % self.queue, "--broker=%s" % self.broker.host_port()]) self.sender.wait() @@ -502,7 +502,7 @@ acl allow all all "--timeout=1", "--print-content=no", "--failover-updates", - "--connection-options={reconnect:true}", + "--connection-options={reconnect:true,reconnect-timeout:5}", "--ack-frequency=1", "--address=flq", "--broker=%s" % cluster[1].host_port()]) @@ -527,7 +527,7 @@ acl allow all all "--timeout=1", "--print-content=no", "--failover-updates", - "--connection-options={reconnect:true}", + "--connection-options={reconnect:true,reconnect-timeout:5}", "--ack-frequency=1", "--address=flq", "--broker=%s" % cluster[2].host_port()]) |