summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/brokertest.py
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2011-03-30 19:30:16 +0000
committerAlan Conway <aconway@apache.org>2011-03-30 19:30:16 +0000
commit61dc74c19dd6248e4f467804b4c8f00c8cf4ad12 (patch)
tree62a2bfe04a02014f8d43563d76fac434a2061ae2 /qpid/cpp/src/tests/brokertest.py
parentcfbe48cd9b8432600864e89465c321020a8940cd (diff)
downloadqpid-python-61dc74c19dd6248e4f467804b4c8f00c8cf4ad12.tar.gz
QPID-3129: cluster_tests.LongTests.test_failover hangs
Fix is a race condition in posix/Socket.cpp Socket::connect. When connecting to a port on the same host which no longer has a process associated with it the OS occasionally chooses the remote port (which is unoccupied) as the port to bind the local end of the socket, resulting in a "circular" connection. This seems like something the OS should prevent but I have confirmed that the sporadic hangs in cluster_tests.LongTests.test_failover on RHEL5 are caused by such a circular connection. The fix is to detect circular connections and raise an error. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1087052 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/brokertest.py')
-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 1023f7152f..4abe4c2cbe 100644
--- a/qpid/cpp/src/tests/brokertest.py
+++ b/qpid/cpp/src/tests/brokertest.py
@@ -498,7 +498,7 @@ class BrokerTest(TestCase):
r.close()
self.assertEqual(expect_contents, actual_contents)
-def join(thread, timeout=1):
+def join(thread, timeout=10):
thread.join(timeout)
if thread.isAlive(): raise Exception("Timed out joining thread %s"%thread)