diff options
| author | Alan Conway <aconway@apache.org> | 2009-02-03 21:28:14 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-02-03 21:28:14 +0000 |
| commit | 729e9ce65125154cfdd2877abc8f7a901ad7caa2 (patch) | |
| tree | 433e563454062f0ab10705cb1913b0de53558168 /cpp/src/tests | |
| parent | 779753f10d0ff1295d1282e367a3973f283ab34f (diff) | |
| download | qpid-python-729e9ce65125154cfdd2877abc8f7a901ad7caa2.tar.gz | |
Fix for race conditions in cluster join.
- ConnectionDecoder: separated from Connection.
- cluster/PollableQueue: stop processing frames if PollableQueue is stopped.
- move state checks in event-queue handler to frame-queue handler.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@740459 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/ForkedBroker.h | 1 | ||||
| -rw-r--r-- | cpp/src/tests/cluster_test.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/tests/ForkedBroker.h b/cpp/src/tests/ForkedBroker.h index bf9e9265c4..925f8011f2 100644 --- a/cpp/src/tests/ForkedBroker.h +++ b/cpp/src/tests/ForkedBroker.h @@ -108,6 +108,7 @@ class ForkedBroker { std::vector<const char*> args2(args); args2.push_back("--port=0"); args2.push_back("--mgmt-enable=no"); // TODO aconway 2008-07-16: why does mgmt cause problems? + if (!::getenv("QPID_TRACE") && !::getenv("QPID_LOG_ENABLE")) args2.push_back("--log-enable=error+"); // Keep quiet except for errors. args2.push_back(0); execv(prog, const_cast<char* const*>(&args2[0])); diff --git a/cpp/src/tests/cluster_test.cpp b/cpp/src/tests/cluster_test.cpp index b7d28bf914..585c981afc 100644 --- a/cpp/src/tests/cluster_test.cpp +++ b/cpp/src/tests/cluster_test.cpp @@ -219,7 +219,7 @@ QPID_AUTO_TEST_CASE(testSequenceOptions) { ClusterFixture cluster(1); Client c0(cluster[0], "c0"); FieldTable args; - args.setInt("qpid.msg_sequence", 1); // FIXME aconway 2008-11-11: works with "qpid.sequence_counter"?? + args.setInt("qpid.msg_sequence", 1); c0.session.queueDeclare(arg::queue="q"); c0.session.exchangeDeclare(arg::exchange="ex", arg::type="direct", arg::arguments=args); c0.session.exchangeBind(arg::exchange="ex", arg::queue="q", arg::bindingKey="k"); @@ -452,7 +452,7 @@ QPID_AUTO_TEST_CASE(testConnectionKnownHosts) { BOOST_CHECK_EQUAL(kb0, kb2); } -QPID_AUTO_TEST_CASE(UpdateConsumers) { +QPID_AUTO_TEST_CASE(testUpdateConsumers) { ClusterFixture cluster(1, 1); Client c0(cluster[0], "c0"); |