diff options
| author | Alan Conway <aconway@apache.org> | 2007-10-29 21:14:44 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-10-29 21:14:44 +0000 |
| commit | b29d9eea42c217b457bb298bad390415ecf5eeff (patch) | |
| tree | d6e5fed83b962eef780f3aa73509590b6ac66a17 /qpid/cpp/src/tests/Cluster.cpp | |
| parent | 36b42cd7921cae46f99cc6bf1c83f2ddacf21395 (diff) | |
| download | qpid-python-b29d9eea42c217b457bb298bad390415ecf5eeff.tar.gz | |
client/BlockingQueue.h, sys/ConcurrentQueue.h: merged to sys/BlockingQueue.h
- updated all users
qpid/Exception.h: Removed unimplemented clone() function.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@589857 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/Cluster.cpp')
| -rw-r--r-- | qpid/cpp/src/tests/Cluster.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/qpid/cpp/src/tests/Cluster.cpp b/qpid/cpp/src/tests/Cluster.cpp index 531a74b0c2..ee13bdd72a 100644 --- a/qpid/cpp/src/tests/Cluster.cpp +++ b/qpid/cpp/src/tests/Cluster.cpp @@ -36,8 +36,7 @@ BOOST_AUTO_TEST_CASE(testClusterOne) { TestCluster cluster("clusterOne", "amqp:one:1"); AMQFrame send(1, SessionOpenBody(VER)); cluster.handle(send); - AMQFrame received; - BOOST_REQUIRE(cluster.received.waitPop(received)); + AMQFrame received = cluster.received.pop(); BOOST_CHECK_TYPEID_EQUAL(SessionOpenBody, *received.getBody()); BOOST_CHECK_EQUAL(1u, cluster.size()); Cluster::MemberList members = cluster.getMembers(); @@ -62,11 +61,10 @@ BOOST_AUTO_TEST_CASE(testClusterTwo) { // Exchange frames with child. AMQFrame send(1, SessionOpenBody(VER)); cluster.handle(send); - AMQFrame received; - BOOST_REQUIRE(cluster.received.waitPop(received)); + AMQFrame received = cluster.received.pop(); BOOST_CHECK_TYPEID_EQUAL(SessionOpenBody, *received.getBody()); - BOOST_REQUIRE(cluster.received.waitPop(received)); + received=cluster.received.pop(); BOOST_CHECK_TYPEID_EQUAL(SessionAttachedBody, *received.getBody()); if (!nofork) { |