diff options
| author | Alan Conway <aconway@apache.org> | 2010-12-01 21:32:43 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-12-01 21:32:43 +0000 |
| commit | 554a5e74935d61a9be4a030aa54c501d7caf7416 (patch) | |
| tree | 2a76572b26366ceb3c496098de043c9318a9f50b /qpid/cpp/src/tests | |
| parent | da185c1a45b6287c0ec79fa6fe8adacdba93bff1 (diff) | |
| download | qpid-python-554a5e74935d61a9be4a030aa54c501d7caf7416.tar.gz | |
Enable cluster-safe assertions on transition to CATCHUP
Delaying until READY was causing multiple clientConnect management
events to be raised, because broker::Connection::setUserId relies on
sys::isCluster to avoid producing duplicate events with
cluster::Connection::announce
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1041179 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rwxr-xr-x | qpid/cpp/src/tests/cluster_tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/cluster_tests.py b/qpid/cpp/src/tests/cluster_tests.py index 516595b9e7..9f70121b74 100755 --- a/qpid/cpp/src/tests/cluster_tests.py +++ b/qpid/cpp/src/tests/cluster_tests.py @@ -293,7 +293,7 @@ class LongTests(BrokerTest): i += 1 b = cluster.start(expect=EXPECT_EXIT_FAIL) ErrorGenerator(b) - time.sleep(min(5,self.duration()/2)) + time.sleep(5) sender.stop() receiver.stop() for i in range(i, len(cluster)): cluster[i].kill() @@ -382,7 +382,7 @@ class LongTests(BrokerTest): start_mclients(cluster[alive]) while time.time() < endtime: - time.sleep(max(5,self.duration()/4)) + time.sleep(5) for b in cluster[alive:]: b.ready() # Check if a broker crashed. # Kill the first broker, expect the clients to fail. b = cluster[alive] |