summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2012-02-17 14:17:53 +0000
committerAlan Conway <aconway@apache.org>2012-02-17 14:17:53 +0000
commit758d7e8fa77132000ef5abca2e04256e9f438000 (patch)
tree8cfbe34777dd63ac04bedd0300aa289cbb37c7d9
parentd8b41424f905ba6ab7a83c3da4e658ce4dab9f52 (diff)
downloadqpid-python-758d7e8fa77132000ef5abca2e04256e9f438000.tar.gz
QPID-3603: Increase timeouts in brokertest.py, were causing spurious failures.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3603-7@1245560 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/tests/brokertest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py
index 5f235e4451..3207a51b79 100644
--- a/qpid/cpp/src/tests/brokertest.py
+++ b/qpid/cpp/src/tests/brokertest.py
@@ -76,7 +76,7 @@ def error_line(filename, n=1):
except: return ""
return ":\n" + "".join(result)
-def retry(function, timeout=1, delay=.01):
+def retry(function, timeout=10, delay=.01):
"""Call function until it returns True or timeout expires.
Double the delay for each retry. Return True if function
returns true, False if timeout expires."""
@@ -526,7 +526,7 @@ class BrokerTest(TestCase):
retry(test, timeout, delay)
self.assertEqual(expect_contents, self.browse(session, queue, 0, transform=transform))
-def join(thread, timeout=1):
+def join(thread, timeout=10):
thread.join(timeout)
if thread.isAlive(): raise Exception("Timed out joining thread %s"%thread)