BIND 10 trac999, updated. 041c3ec8a0768c513131f47467652ab2aa75a07a [trac999] reverted the log level to the default for now to prevent possibly confusing output unconditionally.

[BIND 10 source code commits]

The branch, trac999 has been updated
       via  041c3ec8a0768c513131f47467652ab2aa75a07a (commit)
       via  ab31e2fbf10950084d9cda73c0b4fc7d36296817 (commit)
      from  21a333f512f2a11ce0c770b7d72aacfb623d0c14 (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 041c3ec8a0768c513131f47467652ab2aa75a07a
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon Jun 27 09:33:35 2011 -0700

    [trac999] reverted the log level to the default for now to prevent
    possibly confusing output unconditionally.

commit ab31e2fbf10950084d9cda73c0b4fc7d36296817
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon Jun 27 09:31:33 2011 -0700

    [trac999] in the defaultQueryACL test, make sure the spec default isn't loaded.

-----------------------------------------------------------------------

Summary of changes:
 src/bin/resolver/tests/resolver_config_unittest.cc |    6 ++++++
 src/bin/resolver/tests/run_unittests.cc            |    3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/resolver/tests/resolver_config_unittest.cc b/src/bin/resolver/tests/resolver_config_unittest.cc
index c328813..9006301 100644
--- a/src/bin/resolver/tests/resolver_config_unittest.cc
+++ b/src/bin/resolver/tests/resolver_config_unittest.cc
@@ -256,6 +256,12 @@ TEST_F(ResolverConfig, defaultQueryACL) {
     EXPECT_EQ(REJECT, server.getQueryACL().execute(createClient("192.0.2.1")));
     EXPECT_EQ(REJECT, server.getQueryACL().execute(
                   createClient("2001:db8::1")));
+
+    // The following would be allowed if the server had loaded the default
+    // configuration from the spec file.  In this context it should not have
+    // happened, and they should be rejected just like the above cases.
+    EXPECT_EQ(REJECT, server.getQueryACL().execute(createClient("127.0.0.1")));
+    EXPECT_EQ(REJECT, server.getQueryACL().execute(createClient("::1")));
 }
 
 TEST_F(ResolverConfig, emptyQueryACL) {
diff --git a/src/bin/resolver/tests/run_unittests.cc b/src/bin/resolver/tests/run_unittests.cc
index f5363c4..d3bbab7 100644
--- a/src/bin/resolver/tests/run_unittests.cc
+++ b/src/bin/resolver/tests/run_unittests.cc
@@ -23,8 +23,7 @@ main(int argc, char* argv[]) {
     ::testing::InitGoogleTest(&argc, argv);
     isc::UnitTestUtil::addDataPath(TEST_DATA_DIR);
     isc::UnitTestUtil::addDataPath(TEST_DATA_BUILDDIR);
-    isc::log::initLogger("resolver_test", isc::log::DEBUG,
-                         isc::log::MAX_DEBUG_LEVEL);
+    isc::log::initLogger();
 
     return (isc::util::unittests::run_all());
 }