summaryrefslogtreecommitdiff
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
commitffffe1b5cd71d2f12a26124a903811a1e3da3c12 (patch)
tree90097b2e17b155d95665020e9107c93c5696a749
parent7f39f1fec83ba82b8f6b6732dda393c3b30d0b85 (diff)
downloadqpid-python-ffffe1b5cd71d2f12a26124a903811a1e3da3c12.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@1135786 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/tests/brokertest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py
index 538175b525..249cc126cb 100644
--- a/qpid/cpp/src/tests/brokertest.py
+++ b/qpid/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)