From: Thomas Markwalder Date: Fri, 9 Dec 2016 21:15:25 +0000 (-0500) Subject: [5046] Minor cleanups X-Git-Tag: trac5030_base~1^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ea58aa99aa6756d259f58100d72f3221a8c6746;p=thirdparty%2Fkea.git [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 1338a91c11..779b1d5d79 100644 --- 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 2eed5762bd..98520cba16 100644 --- 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