svn commit: r1523094 - in /qpid/trunk/qpid/cpp/src/tests: brokertest.py ha_tests.py

[ac...@apache.org]

Author: aconway
Date: Fri Sep 13 20:47:37 2013
New Revision: 1523094

URL: http://svn.apache.org/r1523094
Log:
QPID-4944: HA fix failure of test_failover_send_receive on slow machines.

At the end of this test, receivers read remaining messages on queues.
Previously the test limited the max depth at 1024, but this was
too high on some slower machines and caused a timeout. The test now
limits the max depth to 50, which seems to work on a range of machines.
There's no impact on the effectiveness of the test for failover.

Modified:
    qpid/trunk/qpid/cpp/src/tests/brokertest.py
    qpid/trunk/qpid/cpp/src/tests/ha_tests.py

Modified: qpid/trunk/qpid/cpp/src/tests/brokertest.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/brokertest.py?rev=1523094&r1=1523093&r2=1523094&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/brokertest.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/brokertest.py Fri Sep 13 20:47:37 2013
@@ -478,7 +478,7 @@ class BrokerTest(TestCase):
     def assert_browse(self, *args, **kwargs): assert_browse(*args, **kwargs)
     def assert_browse_retry(self, *args, **kwargs): assert_browse_retry(*args, **kwargs)
 
-def join(thread, timeout=10):
+def join(thread, timeout=30):
     thread.join(timeout)
     if thread.isAlive(): raise Exception("Timed out joining thread %s"%thread)
 

Modified: qpid/trunk/qpid/cpp/src/tests/ha_tests.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ha_tests.py?rev=1523094&r1=1523093&r2=1523094&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ha_tests.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/ha_tests.py Fri Sep 13 20:47:37 2013
@@ -942,7 +942,7 @@ class LongTests(HaBrokerTest):
         n = 10
         senders = [
             NumberedSender(
-                brokers[0], url=brokers.url,max_depth=1024, failover_updates=False,
+                brokers[0], url=brokers.url,max_depth=50, failover_updates=False,
                 queue="test%s"%(i), args=["--capacity=10"]) for i in xrange(n)]
 
         receivers = [



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org