summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/cluster_tests.py
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2010-11-23 20:55:21 +0000
committerAlan Conway <aconway@apache.org>2010-11-23 20:55:21 +0000
commita4bcd6b7c0a3e427761b2290740c1a9db3cc12c3 (patch)
tree45444fd033ea585e9a254197f734d698c22234a0 /qpid/cpp/src/tests/cluster_tests.py
parent1df696a8256823ec9f40141b3ec65d94254f7aa0 (diff)
downloadqpid-python-a4bcd6b7c0a3e427761b2290740c1a9db3cc12c3.tar.gz
Revert test change causing failures.
Will restore the change once the failure is addressed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1038341 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/cluster_tests.py')
-rwxr-xr-xqpid/cpp/src/tests/cluster_tests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/cluster_tests.py b/qpid/cpp/src/tests/cluster_tests.py
index 9f70121b74..516595b9e7 100755
--- a/qpid/cpp/src/tests/cluster_tests.py
+++ b/qpid/cpp/src/tests/cluster_tests.py
@@ -293,7 +293,7 @@ class LongTests(BrokerTest):
i += 1
b = cluster.start(expect=EXPECT_EXIT_FAIL)
ErrorGenerator(b)
- time.sleep(5)
+ time.sleep(min(5,self.duration()/2))
sender.stop()
receiver.stop()
for i in range(i, len(cluster)): cluster[i].kill()
@@ -382,7 +382,7 @@ class LongTests(BrokerTest):
start_mclients(cluster[alive])
while time.time() < endtime:
- time.sleep(5)
+ time.sleep(max(5,self.duration()/4))
for b in cluster[alive:]: b.ready() # Check if a broker crashed.
# Kill the first broker, expect the clients to fail.
b = cluster[alive]