[4492] Addressed review comments

src/bin/dhcp4/tests/hooks_unittest.cc
src/bin/dhcp6/tests/hooks_unittest.cc
    Fixed includes, copyright, and removed unnecessary calls to
    IfaceMgr::instance().deleteAllExternalSockets();

diff --git a/src/bin/dhcp4/tests/hooks_unittest.cc b/src/bin/dhcp4/tests/hooks_unittest.cc
index b0814ca0f9ace11613a265e23678337046a9cef0..7a2e0a88439fbe0a65521dba24445f298ef5ba57 100644 (file)
--- a/src/bin/dhcp4/tests/hooks_unittest.cc
+++ b/src/bin/dhcp4/tests/hooks_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2016 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -17,8 +17,8 @@
 #include <dhcp/tests/iface_mgr_test_config.h>
 #include <dhcp/option.h>
 #include <asiolink/io_address.h>
-#include "marker_file.h"
-#include "test_libraries.h"
+#include <dhcp4/tests/marker_file.h>
+#include <dhcp4/tests/test_libraries.h>
 
 #include <vector>
 
@@ -585,8 +585,6 @@ public:
         // Get rid of any marker files.
         static_cast<void>(remove(LOAD_MARKER_FILE));
         static_cast<void>(remove(UNLOAD_MARKER_FILE));
-
-        IfaceMgr::instance().deleteAllExternalSockets();
         CfgMgr::instance().clear();
     }
 };

diff --git a/src/bin/dhcp6/tests/hooks_unittest.cc b/src/bin/dhcp6/tests/hooks_unittest.cc
index 1b3f0e867c214c2bc6061276a7959b03d432f33f..7907174422718865e4e2f0193a255f00480085fd 100644 (file)
--- a/src/bin/dhcp6/tests/hooks_unittest.cc
+++ b/src/bin/dhcp6/tests/hooks_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -24,8 +24,8 @@
 #include <dhcp/tests/iface_mgr_test_config.h>
 #include <dhcp/tests/pkt_captures.h>
 #include <cc/command_interpreter.h>
-#include "marker_file.h"
-#include "test_libraries.h"
+#include <dhcp6/tests/marker_file.h>
+#include <dhcp6/tests/test_libraries.h>
 
 #include <boost/scoped_ptr.hpp>
 #include <gtest/gtest.h>
@@ -575,7 +575,6 @@ public:
         static_cast<void>(remove(LOAD_MARKER_FILE));
         static_cast<void>(remove(UNLOAD_MARKER_FILE));
 
-        IfaceMgr::instance().deleteAllExternalSockets();
         CfgMgr::instance().clear();
     }
 };