BIND 10 master, updated. 6f0bcc61de660384c2e6c1951cf3d60b45789698 [2024] Remove obsolete comment about io_service_
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Jun 12 14:07:09 UTC 2012
The branch, master has been updated
via 6f0bcc61de660384c2e6c1951cf3d60b45789698 (commit)
via 3eaafc4154640f7c6ebf026fc4592f05a0872aa2 (commit)
via 450385079016a4f99105ecaf85f6d22aa90762b7 (commit)
via 4efe9acc28ed253db206ab91df2382358947a094 (commit)
from 45eb75402443584059a2a061f904653b88774d69 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6f0bcc61de660384c2e6c1951cf3d60b45789698
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Jun 12 18:53:28 2012 +0530
[2024] Remove obsolete comment about io_service_
commit 3eaafc4154640f7c6ebf026fc4592f05a0872aa2
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Jun 12 02:02:14 2012 +0530
[2024] Reset callback_ during SetUp() instead of in setDNSService()
commit 450385079016a4f99105ecaf85f6d22aa90762b7
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Jun 12 01:39:48 2012 +0530
[2024] Change io_service_ to not be a pointer anymore
commit 4efe9acc28ed253db206ab91df2382358947a094
Author: Mukund Sivaraman <muks at isc.org>
Date: Wed Jun 6 15:35:01 2012 +0530
[2024] Don't call setDNSService() multiple times
-----------------------------------------------------------------------
Summary of changes:
src/lib/resolve/tests/recursive_query_unittest.cc | 56 +++++++++++----------
1 file changed, 29 insertions(+), 27 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/resolve/tests/recursive_query_unittest.cc b/src/lib/resolve/tests/recursive_query_unittest.cc
index a8b8057..02721f1 100644
--- a/src/lib/resolve/tests/recursive_query_unittest.cc
+++ b/src/lib/resolve/tests/recursive_query_unittest.cc
@@ -175,6 +175,10 @@ protected:
resolver_.reset();
}
+ void SetUp() {
+ callback_.reset(new ASIOCallBack(this));
+ }
+
// Send a test UDP packet to a mock server
void sendUDP(const int family) {
ScopedAddrInfo sai(resolveAddress(family, IPPROTO_UDP, false));
@@ -190,7 +194,7 @@ protected:
if (cc != sizeof(test_data)) {
isc_throw(IOError, "unexpected sendto result: " << cc);
}
- io_service_->run();
+ io_service_.run();
}
// Send a test TCP packet to a mock server
@@ -210,7 +214,7 @@ protected:
if (cc != sizeof(test_data)) {
isc_throw(IOError, "unexpected send result: " << cc);
}
- io_service_->run();
+ io_service_.run();
}
// Receive a UDP packet from a mock server; used for testing
@@ -233,10 +237,10 @@ protected:
// The IO service queue should have a RecursiveQuery object scheduled
// to run at this point. This call will cause it to begin an
// async send, then return.
- io_service_->run_one();
+ io_service_.run_one();
// ... and this one will block until the send has completed
- io_service_->run_one();
+ io_service_.run_one();
// Now we attempt to recv() whatever was sent.
// XXX: there's no guarantee the receiving socket can immediately get
@@ -326,9 +330,7 @@ protected:
// Set up empty DNS Service
// Set up an IO Service queue without any addresses
void setDNSService() {
- io_service_.reset(new IOService());
- callback_.reset(new ASIOCallBack(this));
- dns_service_.reset(new DNSService(*io_service_, callback_.get(), NULL,
+ dns_service_.reset(new DNSService(io_service_, callback_.get(), NULL,
NULL));
}
@@ -491,12 +493,10 @@ private:
static_cast<const uint8_t*>(io_message.getData()),
static_cast<const uint8_t*>(io_message.getData()) +
io_message.getDataSize());
- io_service_->stop();
+ io_service_.stop();
}
protected:
- // We use a pointer for io_service_, because for some tests we
- // need to recreate a new one within one onstance of this class
- scoped_ptr<IOService> io_service_;
+ IOService io_service_;
scoped_ptr<DNSService> dns_service_;
scoped_ptr<isc::nsas::NameserverAddressStore> nsas_;
isc::cache::ResolverCache cache_;
@@ -513,24 +513,26 @@ RecursiveQueryTest::RecursiveQueryTest() :
dns_service_(NULL), callback_(NULL), callback_protocol_(0),
callback_native_(-1), resolver_(new isc::util::unittests::TestResolver())
{
- io_service_.reset(new IOService());
- setDNSService(true, true);
nsas_.reset(new isc::nsas::NameserverAddressStore(resolver_));
}
TEST_F(RecursiveQueryTest, v6UDPSend) {
+ setDNSService(true, true);
doTest(AF_INET6, IPPROTO_UDP);
}
TEST_F(RecursiveQueryTest, v6TCPSend) {
+ setDNSService(true, true);
doTest(AF_INET6, IPPROTO_TCP);
}
TEST_F(RecursiveQueryTest, v4UDPSend) {
+ setDNSService(true, true);
doTest(AF_INET, IPPROTO_UDP);
}
TEST_F(RecursiveQueryTest, v4TCPSend) {
+ setDNSService(true, true);
doTest(AF_INET, IPPROTO_TCP);
}
@@ -643,7 +645,7 @@ TEST_F(RecursiveQueryTest, forwarderSend) {
// to the same port as the actual server
uint16_t port = boost::lexical_cast<uint16_t>(TEST_CLIENT_PORT);
- MockServer server(*io_service_);
+ MockServer server(io_service_);
RecursiveQuery rq(*dns_service_,
*nsas_, cache_,
singleAddress(TEST_IPV4_ADDR, port),
@@ -766,7 +768,7 @@ TEST_F(RecursiveQueryTest, forwardQueryTimeout) {
// Prepare the server
bool done(true);
- MockServerStop server(*io_service_, &done);
+ MockServerStop server(io_service_, &done);
// Do the answer
const uint16_t port = boost::lexical_cast<uint16_t>(TEST_CLIENT_PORT);
@@ -784,7 +786,7 @@ TEST_F(RecursiveQueryTest, forwardQueryTimeout) {
boost::shared_ptr<MockResolverCallback> callback(new MockResolverCallback(&server));
query.forward(ConstMessagePtr(&query_message), answer, buffer, &server, callback);
// Run the test
- io_service_->run();
+ io_service_.run();
EXPECT_EQ(callback->result, MockResolverCallback::FAILURE);
}
@@ -800,7 +802,7 @@ TEST_F(RecursiveQueryTest, forwardClientTimeout) {
// Prepare the server
bool done1(true);
- MockServerStop server(*io_service_, &done1);
+ MockServerStop server(io_service_, &done1);
MessagePtr answer(new Message(Message::RENDER));
@@ -819,7 +821,7 @@ TEST_F(RecursiveQueryTest, forwardClientTimeout) {
boost::shared_ptr<MockResolverCallback> callback(new MockResolverCallback(&server));
query.forward(ConstMessagePtr(&query_message), answer, buffer, &server, callback);
// Run the test
- io_service_->run();
+ io_service_.run();
EXPECT_EQ(callback->result, MockResolverCallback::FAILURE);
}
@@ -834,7 +836,7 @@ TEST_F(RecursiveQueryTest, forwardLookupTimeout) {
// Prepare the server
bool done(true);
- MockServerStop server(*io_service_, &done);
+ MockServerStop server(io_service_, &done);
MessagePtr answer(new Message(Message::RENDER));
@@ -854,7 +856,7 @@ TEST_F(RecursiveQueryTest, forwardLookupTimeout) {
boost::shared_ptr<MockResolverCallback> callback(new MockResolverCallback(&server));
query.forward(ConstMessagePtr(&query_message), answer, buffer, &server, callback);
// Run the test
- io_service_->run();
+ io_service_.run();
EXPECT_EQ(callback->result, MockResolverCallback::FAILURE);
}
@@ -869,7 +871,7 @@ TEST_F(RecursiveQueryTest, lowtimeouts) {
// Prepare the server
bool done(true);
- MockServerStop server(*io_service_, &done);
+ MockServerStop server(io_service_, &done);
MessagePtr answer(new Message(Message::RENDER));
@@ -889,7 +891,7 @@ TEST_F(RecursiveQueryTest, lowtimeouts) {
boost::shared_ptr<MockResolverCallback> callback(new MockResolverCallback(&server));
query.forward(ConstMessagePtr(&query_message), answer, buffer, &server, callback);
// Run the test
- io_service_->run();
+ io_service_.run();
EXPECT_EQ(callback->result, MockResolverCallback::FAILURE);
}
@@ -903,7 +905,7 @@ TEST_F(RecursiveQueryTest, DISABLED_recursiveSendOk) {
setDNSService(true, false);
bool done;
- MockServerStop server(*io_service_, &done);
+ MockServerStop server(io_service_, &done);
vector<pair<string, uint16_t> > empty_vector;
RecursiveQuery rq(*dns_service_, *nsas_, cache_, empty_vector,
empty_vector, 10000, 0);
@@ -912,7 +914,7 @@ TEST_F(RecursiveQueryTest, DISABLED_recursiveSendOk) {
OutputBufferPtr buffer(new OutputBuffer(0));
MessagePtr answer(new Message(Message::RENDER));
rq.resolve(q, answer, buffer, &server);
- io_service_->run();
+ io_service_.run();
// Check that the answer we got matches the one we wanted
EXPECT_EQ(Rcode::NOERROR(), answer->getRcode());
@@ -929,7 +931,7 @@ TEST_F(RecursiveQueryTest, DISABLED_recursiveSendNXDOMAIN) {
setDNSService(true, false);
bool done;
- MockServerStop server(*io_service_, &done);
+ MockServerStop server(io_service_, &done);
vector<pair<string, uint16_t> > empty_vector;
RecursiveQuery rq(*dns_service_, *nsas_, cache_, empty_vector,
empty_vector, 10000, 0);
@@ -938,7 +940,7 @@ TEST_F(RecursiveQueryTest, DISABLED_recursiveSendNXDOMAIN) {
OutputBufferPtr buffer(new OutputBuffer(0));
MessagePtr answer(new Message(Message::RENDER));
rq.resolve(q, answer, buffer, &server);
- io_service_->run();
+ io_service_.run();
// Check that the answer we got matches the one we wanted
EXPECT_EQ(Rcode::NXDOMAIN(), answer->getRcode());
@@ -1012,7 +1014,7 @@ TEST_F(RecursiveQueryTest, CachedNS) {
OutputBufferPtr buffer(new OutputBuffer(0));
MessagePtr answer(new Message(Message::RENDER));
// The server is here so we have something to pass there
- MockServer server(*io_service_);
+ MockServer server(io_service_);
rq.resolve(q, answer, buffer, &server);
// We don't need to run the service in this test. We are interested only
// in the place it starts resolving at
More information about the bind10-changes
mailing list