mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 13:37:55 +00:00
Code Issues Releases Wiki Activity

[4492] Addressed review comments

Browse Source 
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();
This commit is contained in:
Thomas Markwalder
2016-05-09 07:32:51 -04:00
parent 05561a60d5
commit 552ce310fe
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/dhcp4/tests/hooks_unittest.cc
View File

@@ -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 // 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 // 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/tests/iface_mgr_test_config.h>
#include <dhcp/option.h> #include <dhcp/option.h>
#include <asiolink/io_address.h> #include <asiolink/io_address.h>
#include "marker_file.h" #include <dhcp4/tests/marker_file.h>
#include "test_libraries.h" #include <dhcp4/tests/test_libraries.h>
#include <vector> #include <vector>
@@ -585,8 +585,6 @@ public:
// Get rid of any marker files. // Get rid of any marker files.
static_cast<void>(remove(LOAD_MARKER_FILE)); static_cast<void>(remove(LOAD_MARKER_FILE));
static_cast<void>(remove(UNLOAD_MARKER_FILE)); static_cast<void>(remove(UNLOAD_MARKER_FILE));
IfaceMgr::instance().deleteAllExternalSockets();
CfgMgr::instance().clear(); CfgMgr::instance().clear();
} }
}; };

7
src/bin/dhcp6/tests/hooks_unittest.cc
View File

@@ -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 // 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 // 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/iface_mgr_test_config.h>
#include <dhcp/tests/pkt_captures.h> #include <dhcp/tests/pkt_captures.h>
#include <cc/command_interpreter.h> #include <cc/command_interpreter.h>
#include "marker_file.h" #include <dhcp6/tests/marker_file.h>
#include "test_libraries.h" #include <dhcp6/tests/test_libraries.h>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <gtest/gtest.h> #include <gtest/gtest.h>
@@ -575,7 +575,6 @@ public:
static_cast<void>(remove(LOAD_MARKER_FILE)); static_cast<void>(remove(LOAD_MARKER_FILE));
static_cast<void>(remove(UNLOAD_MARKER_FILE)); static_cast<void>(remove(UNLOAD_MARKER_FILE));
IfaceMgr::instance().deleteAllExternalSockets();
CfgMgr::instance().clear(); CfgMgr::instance().clear();
} }
}; };