diff options
| author | Ted Ross <tross@apache.org> | 2010-03-30 21:48:50 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2010-03-30 21:48:50 +0000 |
| commit | 8554740df378860da8e2124ea481e464208c4377 (patch) | |
| tree | fa274e8eea9e37abb511933a613721d1f53036e3 /qpid/cpp/src/tests | |
| parent | 153da67fa601a2f20da496b1982469f67ba7ea0a (diff) | |
| download | qpid-python-qmf-devel0.7a.tar.gz | |
Merged Alan's cluster changes from trunk.qmf-devel0.7a
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qmf-devel0.7a@929314 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rwxr-xr-x | qpid/cpp/src/tests/cluster_tests.py | 7 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/failover_soak.cpp | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/cluster_tests.py b/qpid/cpp/src/tests/cluster_tests.py index fe020786dc..0c4b0350a7 100755 --- a/qpid/cpp/src/tests/cluster_tests.py +++ b/qpid/cpp/src/tests/cluster_tests.py @@ -404,12 +404,17 @@ class StoreTests(BrokerTest): c = cluster.start("c", expect=EXPECT_EXIT_FAIL) a.send_message("q", Message("x", durable=True)) a.kill() + # FIXME aconway 2010-03-29: this test has too many sleeps. + # Need to tighten up status persistence to be more atomic and less + # prone to interruption. + time.sleep(0.1) # pause for b to update status. b.kill() # c is last man time.sleep(0.1) # pause for c to find out hes last. a = cluster.start("a", expect=EXPECT_EXIT_FAIL) # c no longer last man + time.sleep(0.1) # pause for c to find out hes no longer last. c.kill() # a is now last man time.sleep(0.1) # pause for a to find out hes last. - a.kill() # really last + a.kill() # really last, should be clean. # b & c should be dirty b = cluster.start("b", wait=False, expect=EXPECT_EXIT_FAIL) self.assert_dirty_store(b) diff --git a/qpid/cpp/src/tests/failover_soak.cpp b/qpid/cpp/src/tests/failover_soak.cpp index 8bf6eca9e6..cd7aaa6614 100644 --- a/qpid/cpp/src/tests/failover_soak.cpp +++ b/qpid/cpp/src/tests/failover_soak.cpp @@ -337,7 +337,6 @@ startNewBroker ( brokerVector & brokers, int verbosity, int durable ) { - // ("--log-enable=notice+") static int brokerId = 0; stringstream path, prefix; prefix << "soak-" << brokerId; @@ -348,7 +347,8 @@ startNewBroker ( brokerVector & brokers, ("--mgmt-enable=no") ("--log-prefix")(prefix.str()) ("--log-to-file")(prefix.str()+".log") - ("--log-enable=notice+") + ("--log-enable=info+") + ("--log-enable=debug+:cluster") ("TMP_DATA_DIR"); if (endsWith(moduleOrDir, "cluster.so")) { |