diff options
| author | Alan Conway <aconway@apache.org> | 2013-09-13 20:47:37 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2013-09-13 20:47:37 +0000 |
| commit | dded83a88672c075932024464c217472a67f224b (patch) | |
| tree | 33b6ad62645a469177957f53e06cdeadf2628d02 /cpp/src/tests | |
| parent | b07ea55112a0bb1df8bd1bf20731e673db9f8150 (diff) | |
| download | qpid-python-dded83a88672c075932024464c217472a67f224b.tar.gz | |
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.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1523094 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/brokertest.py | 2 | ||||
| -rwxr-xr-x | cpp/src/tests/ha_tests.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/tests/brokertest.py b/cpp/src/tests/brokertest.py index c8f8d3ff38..2786454399 100644 --- a/cpp/src/tests/brokertest.py +++ b/cpp/src/tests/brokertest.py @@ -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) diff --git a/cpp/src/tests/ha_tests.py b/cpp/src/tests/ha_tests.py index 3c126072af..6941a2b545 100755 --- a/cpp/src/tests/ha_tests.py +++ b/cpp/src/tests/ha_tests.py @@ -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 = [ |