diff options
| author | Alan Conway <aconway@apache.org> | 2007-07-24 19:39:27 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-07-24 19:39:27 +0000 |
| commit | c2efe8deabde635f07e78d438fc529ca67d34133 (patch) | |
| tree | 5a72156552781e1044dbecfb7ae41b71be51a6c7 /qpid/cpp/src/tests/Cluster_child.cpp | |
| parent | f6ce4582d32b38dee7139dd286a7abcc4f8695cc (diff) | |
| download | qpid-python-c2efe8deabde635f07e78d438fc529ca67d34133.tar.gz | |
* Summary:
- Wiring (declare/delete/bind) is replicated via AIS.
- TestOptions includes all logging options.
- Logger automatically parses env vars so logging can be enabled
for any program linked with libqpidcommon e.g. by setting QPID_TRACE=1.
* src/qpid/cluster/SessionManager.cpp: Handle frames from cluster
- Forward to BrokerAdapter for execution.
- Suppress responses in proxy.
* src/tests/TestOptions.h (Options): Logging options, --help option.
* src/qpid/client/ClientConnection.cpp: Removed log initialization.
Logs are initialized either in TestOptions or automatically from env vars,
e.g. QPID_TRACE,
* src/qpid/QpidError.h (class QpidError): Initialize Exception in
constructor so messages can be logged.
* src/qpid/framing/ChannelAdapter.h: Made send() virtual.
* src/tests/Cluster_child.cpp: UUID corrected.
* src/qpid/broker/Broker.cpp: Pass chains to updater by ref.
* src/qpid/Options.cpp (parse): Fix log settings from environment.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@559171 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/Cluster_child.cpp')
| -rw-r--r-- | qpid/cpp/src/tests/Cluster_child.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/Cluster_child.cpp b/qpid/cpp/src/tests/Cluster_child.cpp index 9c119e5238..c509dc1950 100644 --- a/qpid/cpp/src/tests/Cluster_child.cpp +++ b/qpid/cpp/src/tests/Cluster_child.cpp @@ -32,15 +32,14 @@ static const ProtocolVersion VER; /** Chlid part of Cluster::clusterTwo test */ void clusterTwo() { - TestCluster cluster("clusterTwo", "amqp::2"); + TestCluster cluster("clusterTwo", "amqp:child:2"); BOOST_REQUIRE(cluster.received.waitFor(1)); // Frame from parent. BOOST_CHECK(cluster.received[0].isIncoming); BOOST_CHECK_TYPEID_EQUAL(ChannelPingBody, *cluster.received[0].frame.getBody()); BOOST_CHECK_EQUAL(2u, cluster.size()); // Me and parent AMQFrame frame(VER, 1, new ChannelOkBody(VER)); - Uuid id(true); - SessionFrame sf(id, frame, false); + SessionFrame sf(cluster.received[0].uuid, frame, false); cluster.handle(sf); BOOST_REQUIRE(cluster.received.waitFor(2)); BOOST_CHECK(!cluster.received[1].isIncoming); |