[5046] Minor cleanups

diff --git a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
index 1338a91c11ec22041b43c0a4ba863a7d035627e0..779b1d5d797013232efd031dc73f0ee2dcef1a30 100644 (file)
--- a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
@@ -122,13 +122,6 @@ public:
         ConstElementPtr answer = server_->processConfig(config);
         ASSERT_TRUE(answer);
 
-#if 0
-        // If the configuration doesn't contain logging config, processConfig()
-        // will revert the logging to default (stdout). We call initLogger()
-        // to restore unit test logging.
-        isc::log::initLogger();
-#endif
-
         int status = 0;
         ConstElementPtr txt = isc::config::parseAnswer(status, answer);
         // This should succeed. If not, print the error message.

diff --git a/src/bin/dhcp4/tests/dhcp4_test_utils.h b/src/bin/dhcp4/tests/dhcp4_test_utils.h
index 2eed5762bddb2204df4928d2593498c943513ecc..98520cba1657a04555b8fcad57ad7699501e8bcc 100644 (file)
--- a/src/bin/dhcp4/tests/dhcp4_test_utils.h
+++ b/src/bin/dhcp4/tests/dhcp4_test_utils.h
@@ -123,8 +123,6 @@ public:
         // Create fixed server id.
         server_id_.reset(new Option4AddrLst(DHO_DHCP_SERVER_IDENTIFIER,
                                             asiolink::IOAddress("192.0.3.1")));
-        // Revert to unit test logging
-        isc::log::initLogger();
     }
 
     /// @brief Returns fixed server identifier assigned to the naked server