From 8b47ecc67da479eb0d8b650c8d172bc81b0343f6 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 9 Mar 2009 17:03:40 +0000 Subject: Fix cluster TTL: replicte expiry information to newcomers. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@751760 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/cluster_test.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'qpid/cpp/src/tests/cluster_test.cpp') diff --git a/qpid/cpp/src/tests/cluster_test.cpp b/qpid/cpp/src/tests/cluster_test.cpp index 1acb2d4bf4..2ff52c1709 100644 --- a/qpid/cpp/src/tests/cluster_test.cpp +++ b/qpid/cpp/src/tests/cluster_test.cpp @@ -151,7 +151,10 @@ vector browse(Client& c, const string& q, int n) { c.subs.subscribe(lq, q, browseSettings); vector result; for (int i = 0; i < n; ++i) { - result.push_back(lq.get(TIMEOUT).getData()); + Message m; + if (!lq.get(m, TIMEOUT)) + break; + result.push_back(m.getData()); } c.subs.getSubscription(q).cancel(); return result; @@ -202,13 +205,23 @@ QPID_AUTO_TEST_CASE(testMessageTimeToLive) { ClusterFixture cluster(2); Client c0(cluster[0], "c0"); Client c1(cluster[1], "c1"); + c0.session.queueDeclare("p"); c0.session.queueDeclare("q"); c0.session.messageTransfer(arg::content=ttlMessage("a", "q", 200)); c0.session.messageTransfer(arg::content=Message("b", "q")); - BOOST_CHECK_EQUAL(browse(c1, "q", 2), list_of("a")("b")); - sys::usleep(300*1000); + c0.session.messageTransfer(arg::content=ttlMessage("x", "p", 10000)); + c0.session.messageTransfer(arg::content=Message("y", "p")); + cluster.add(); + Client c2(cluster[1], "c2"); + + BOOST_CHECK_EQUAL(browse(c0, "p", 2), list_of("x")("y")); + BOOST_CHECK_EQUAL(browse(c1, "p", 2), list_of("x")("y")); + BOOST_CHECK_EQUAL(browse(c2, "p", 2), list_of("x")("y")); + + sys::usleep(200*1000); BOOST_CHECK_EQUAL(browse(c0, "q", 1), list_of("b")); BOOST_CHECK_EQUAL(browse(c1, "q", 1), list_of("b")); + BOOST_CHECK_EQUAL(browse(c2, "q", 1), list_of("b")); } QPID_AUTO_TEST_CASE(testSequenceOptions) { -- cgit v1.2.1