summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2011-06-14 20:48:00 +0000
committerAlan Conway <aconway@apache.org>2011-06-14 20:48:00 +0000
commitffe1a98a4749d84060355bacf881ac1d2ba1324c (patch)
treeb2330f3c13ee63ba02d541cf48024efb2c72fcf7 /cpp/src
parent2e110ee65983c6d681ab400554a46df5d3ed67a1 (diff)
downloadqpid-python-ffe1a98a4749d84060355bacf881ac1d2ba1324c.tar.gz
NO-JIRA: Increase join timeout in brokertest.py, was causing spurious failures.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1135786 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/tests/brokertest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/tests/brokertest.py b/cpp/src/tests/brokertest.py
index 538175b525..249cc126cb 100644
--- a/cpp/src/tests/brokertest.py
+++ b/cpp/src/tests/brokertest.py
@@ -509,7 +509,7 @@ class BrokerTest(TestCase):
actual_contents = self.browse(session, queue, timeout)
self.assertEqual(expect_contents, actual_contents)
-def join(thread, timeout=10):
+def join(thread, timeout=60):
thread.join(timeout)
if thread.isAlive(): raise Exception("Timed out joining thread %s"%thread)