summaryrefslogtreecommitdiff
path: root/cpp/src
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
commit095bab0ec1a0b7286f87fd3f3ee651f786fcf831 (patch)
tree34dbf06a6228f0241a97b652c8342753bfa61769 /cpp/src
parent027e11b75b86b2843a7e05f8a5ccec1d2acfb0a0 (diff)
downloadqpid-python-095bab0ec1a0b7286f87fd3f3ee651f786fcf831.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/qpid@1038341 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rwxr-xr-xcpp/src/tests/cluster_tests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/tests/cluster_tests.py b/cpp/src/tests/cluster_tests.py
index 9f70121b74..516595b9e7 100755
--- a/cpp/src/tests/cluster_tests.py
+++ b/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]