diff options
| author | Alan Conway <aconway@apache.org> | 2008-07-17 02:06:50 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-07-17 02:06:50 +0000 |
| commit | 37103322e9fd5889bc2d412b64bb21eb8743391b (patch) | |
| tree | 8d7c3ece2071d0b2ec4658f6f149322d3e5337fa /cpp/src/tests/cluster_test.cpp | |
| parent | e65b0086a2924ff04640b1350393a816249d01b3 (diff) | |
| download | qpid-python-37103322e9fd5889bc2d412b64bb21eb8743391b.tar.gz | |
Enable dequeue for prototype cluster
- qpid/broker/SemanticState.cpp: moved doOutput into write idle callback.
- qpid/broker/Connection.cpp: make doOutput an intercept point.
- qpid/cluster/*: intercept doOutput to serialize output in cluster thread.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@677486 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/cluster_test.cpp')
| -rw-r--r-- | cpp/src/tests/cluster_test.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/cpp/src/tests/cluster_test.cpp b/cpp/src/tests/cluster_test.cpp index cafac489d2..567896d44d 100644 --- a/cpp/src/tests/cluster_test.cpp +++ b/cpp/src/tests/cluster_test.cpp @@ -225,10 +225,6 @@ QPID_AUTO_TEST_CASE(testMessageEnqueue) { BOOST_CHECK_EQUAL(string("bar"), msg.getData()); } -#if 0 - -// FIXME aconway 2008-07-16: Implement cluster dequeue notification, enable this test. - QPID_AUTO_TEST_CASE(testMessageDequeue) { // Enqueue on one broker, dequeue on two others. ClusterFixture cluster (3); @@ -236,10 +232,10 @@ QPID_AUTO_TEST_CASE(testMessageDequeue) { c0.session.queueDeclare("q"); c0.session.messageTransfer(arg::content=TransferContent("foo", "q")); c0.session.messageTransfer(arg::content=TransferContent("bar", "q")); - c0.session.close(); Message msg; + // Dequeue on 2 others, ensure correct order. Client c1(cluster[1]); BOOST_CHECK(c1.subs.get(msg, "q")); BOOST_CHECK_EQUAL("foo", msg.getData()); @@ -247,12 +243,13 @@ QPID_AUTO_TEST_CASE(testMessageDequeue) { Client c2(cluster[2]); BOOST_CHECK(c1.subs.get(msg, "q")); BOOST_CHECK_EQUAL("bar", msg.getData()); - QueueQueryResult r = c2.session.queueQuery("q"); - BOOST_CHECK_EQUAL(0u, r.getMessageCount()); + + // Queue should be empty on all queues. + BOOST_CHECK_EQUAL(0u, c0.session.queueQuery("q").getMessageCount()); + BOOST_CHECK_EQUAL(0u, c1.session.queueQuery("q").getMessageCount()); + BOOST_CHECK_EQUAL(0u, c2.session.queueQuery("q").getMessageCount()); } // TODO aconway 2008-06-25: failover. -#endif - QPID_AUTO_TEST_SUITE_END() |