From: Thomas Markwalder <tmark@isc.org>
Date: Mon, 9 May 2016 11:32:51 +0000 (-0400)
Subject: [4492] Addressed review comments
X-Git-Tag: trac4106_update_base~28^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=552ce310fe6e4def815f49f3232d1509c5c31b65;p=thirdparty%2Fkea.git

[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 b0814ca0f9..7a2e0a8843 100644
--- 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 1b3f0e867c..7907174422 100644
--- 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();
     }
 };