BIND 10 trac2213, updated. 105208c1e8cd0a77cb8960013a391cc7b48f7a22 [2213] cleanup: removed now-unused functions
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Oct 29 18:10:20 UTC 2012
The branch, trac2213 has been updated
via 105208c1e8cd0a77cb8960013a391cc7b48f7a22 (commit)
via f4390da9f83529b6c3ed4383d7709e9ede1c3d5b (commit)
from 4965591081ad8457f5ff0f3fe3c581f8e1a4da54 (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 105208c1e8cd0a77cb8960013a391cc7b48f7a22
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Oct 29 11:09:06 2012 -0700
[2213] cleanup: removed now-unused functions
this also fixes build failure for some compilers.
commit f4390da9f83529b6c3ed4383d7709e9ede1c3d5b
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Oct 29 11:07:06 2012 -0700
[2213] style cleanup: removed a redundant blank line at EOF
-----------------------------------------------------------------------
Summary of changes:
src/bin/auth/auth_srv.cc | 1 -
src/bin/auth/tests/command_unittest.cc | 75 --------------------------------
2 files changed, 76 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index c9a85fe..73c2ae4 100644
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -927,4 +927,3 @@ void
AuthSrv::loadZone(ConstElementPtr args) {
impl_->datasrc_clients_mgr_.loadZone(args);
}
-
diff --git a/src/bin/auth/tests/command_unittest.cc b/src/bin/auth/tests/command_unittest.cc
index e9cbe3d..be90d73 100644
--- a/src/bin/auth/tests/command_unittest.cc
+++ b/src/bin/auth/tests/command_unittest.cc
@@ -169,81 +169,6 @@ TEST_F(AuthCommandTest, shutdownIncorrectPID) {
EXPECT_EQ(0, rcode_);
}
-// A helper function commonly used for the "loadzone" command tests.
-// It configures the server with a memory data source containing two
-// zones, and checks the zones are correctly loaded.
-void
-zoneChecks(AuthSrv& server) {
- const RRClass rrclass(RRClass::IN());
-
- DataSrcClientsMgr::Holder holder(server.getDataSrcClientsMgr());
- EXPECT_EQ(ZoneFinder::SUCCESS,
- holder.findClientList(rrclass)->find(Name("ns.test1.example"))
- .finder_->find(Name("ns.test1.example"), RRType::A())->code);
- EXPECT_EQ(ZoneFinder::NXRRSET,
- holder.findClientList(rrclass)->find(Name("ns.test1.example")).
- finder_->find(Name("ns.test1.example"), RRType::AAAA())->code);
- EXPECT_EQ(ZoneFinder::SUCCESS,
- holder.findClientList(rrclass)->find(Name("ns.test2.example")).
- finder_->find(Name("ns.test2.example"), RRType::A())->code);
- EXPECT_EQ(ZoneFinder::NXRRSET,
- holder.findClientList(rrclass)->find(Name("ns.test2.example")).
- finder_->find(Name("ns.test2.example"), RRType::AAAA())->code);
-}
-
-void
-installDataSrcClientLists(AuthSrv& server, ClientListMapPtr lists) {
- server.getDataSrcClientsMgr().setDataSrcClientLists(lists);
-}
-
-void
-configureZones(AuthSrv& server) {
- ASSERT_EQ(0, system(INSTALL_PROG " -c " TEST_DATA_DIR "/test1.zone.in "
- TEST_DATA_BUILDDIR "/test1.zone.copied"));
- ASSERT_EQ(0, system(INSTALL_PROG " -c " TEST_DATA_DIR "/test2.zone.in "
- TEST_DATA_BUILDDIR "/test2.zone.copied"));
-
- const ConstElementPtr config(Element::fromJSON("{"
- "\"IN\": [{"
- " \"type\": \"MasterFiles\","
- " \"params\": {"
- " \"test1.example\": \"" +
- string(TEST_DATA_BUILDDIR "/test1.zone.copied") + "\","
- " \"test2.example\": \"" +
- string(TEST_DATA_BUILDDIR "/test2.zone.copied") + "\""
- " },"
- " \"cache-enable\": true"
- "}]}"));
-
- installDataSrcClientLists(server, configureDataSource(config));
-
- zoneChecks(server);
-}
-
-void
-newZoneChecks(AuthSrv& server) {
- const RRClass rrclass(RRClass::IN());
-
- DataSrcClientsMgr::Holder holder(server.getDataSrcClientsMgr());
- EXPECT_EQ(ZoneFinder::SUCCESS, holder.findClientList(rrclass)->
- find(Name("ns.test1.example")).finder_->
- find(Name("ns.test1.example"), RRType::A())->code);
-
- // now test1.example should have ns/AAAA
- EXPECT_EQ(ZoneFinder::SUCCESS, holder.findClientList(rrclass)->
- find(Name("ns.test1.example")).finder_->
- find(Name("ns.test1.example"), RRType::AAAA())->code);
-
- // test2.example shouldn't change
- EXPECT_EQ(ZoneFinder::SUCCESS, holder.findClientList(rrclass)->
- find(Name("ns.test2.example")).finder_->
- find(Name("ns.test2.example"), RRType::A())->code);
- EXPECT_EQ(ZoneFinder::NXRRSET,
- holder.findClientList(rrclass)->
- find(Name("ns.test2.example")).finder_->
- find(Name("ns.test2.example"), RRType::AAAA())->code);
-}
-
TEST_F(AuthCommandTest, getStats) {
result_ = execAuthServerCommand(server_, "getstats", ConstElementPtr());
parseAnswer(rcode_, result_);
More information about the bind10-changes
mailing list