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

[#3831] Fixed UT build and minor nits

Browse Source 
modified:   doc/sphinx/arm/dhcp6-srv.rst
modified:   doc/sphinx/arm/logging.rst
modified:   src/bin/d2/tests/d2_process_tests.sh.in
modified:   src/bin/dhcp4/tests/dhcp4_process_tests.sh.in
modified:   src/bin/dhcp6/json_config_parser.cc
modified:   src/bin/dhcp6/tests/dhcp6_process_tests.sh.in
modified:   src/hooks/dhcp/forensic_log/libloadtests/load_unload_unittests.cc
modified:   src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
modified:   src/lib/hooks/hooks_parser.cc
modified:   src/lib/process/log_parser.cc
modified:   src/lib/process/log_parser.h
modified:   src/lib/testutils/env_var_wrapper.h
modified:   src/lib/util/filesystem.cc
This commit is contained in:
Thomas Markwalder
2025-05-14 14:56:56 -04:00
committed by Andrei Pavel
parent 36972ffcb7
commit dcd07a42aa
13 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/sphinx/arm/dhcp6-srv.rst
View File

@@ -333,7 +333,6 @@ that can be used to configure the memfile backend.
or, if already running, log an unrecoverable error. For ease of use in or, if already running, log an unrecoverable error. For ease of use in
specifying a custom file name simply omit the path component from ``name``. specifying a custom file name simply omit the path component from ``name``.
- ``lfc-interval``: specifies the interval, in seconds, at which the - ``lfc-interval``: specifies the interval, in seconds, at which the
server will perform a lease file cleanup (LFC). This removes server will perform a lease file cleanup (LFC). This removes
redundant (historical) information from the lease file and redundant (historical) information from the lease file and

3
src/bin/d2/tests/d2_process_tests.sh.in
View File

@@ -14,13 +14,14 @@ set -eu
CFG_FILE="@abs_top_builddir@/src/bin/d2/tests/test_config.json" CFG_FILE="@abs_top_builddir@/src/bin/d2/tests/test_config.json"
# Path to the D2 log file. # Path to the D2 log file.
LOG_FILE="@abs_top_builddir@/src/bin/d2/tests/test.log" LOG_FILE="@abs_top_builddir@/src/bin/d2/tests/test.log"
# D2 configuration to be stored in the configuration file.
# Set env KEA_HOOKS_PATH to override DEFAULT_HOOKS_PATH # Set env KEA_HOOKS_PATH to override DEFAULT_HOOKS_PATH
export KEA_HOOKS_PATH="@abs_top_builddir@/src/bin/d2/tests/@dotlibs@" export KEA_HOOKS_PATH="@abs_top_builddir@/src/bin/d2/tests/@dotlibs@"
# Set env KEA_LOG_FILE_DIR to override default log path # Set env KEA_LOG_FILE_DIR to override default log path
export KEA_LOG_FILE_DIR="@abs_top_builddir@/src/bin/d2/tests" export KEA_LOG_FILE_DIR="@abs_top_builddir@/src/bin/d2/tests"
# D2 configuration to be stored in the configuration file.
CONFIG="{ CONFIG="{
\"DhcpDdns\": \"DhcpDdns\":
{ {

2
src/bin/dhcp4/tests/dhcp4_process_tests.sh.in
View File

@@ -24,7 +24,7 @@ HOOK_FAIL_LOAD_PATH="@abs_top_builddir@/src/bin/dhcp4/tests/@dotlibs@libco3.so"
# Path to test hooks library # Path to test hooks library
HOOK_FAIL_POLL_PATH="@abs_top_builddir@/src/bin/dhcp4/tests/@dotlibs@libco4.so" HOOK_FAIL_POLL_PATH="@abs_top_builddir@/src/bin/dhcp4/tests/@dotlibs@libco4.so"
# Set env KEA_HOOKS_PATH to override DEFAULT_HOOKS_PATH # Set env KEA_HOOKS_PATH to override DEFAULT_HOOKS_PATH
export KEA_HOOKS_PATH="@abs_top_builddir@/src/bin/dhcp4/tests/@dotlibs@" export KEA_HOOKS_PATH="@abs_top_builddir@/src/bin/dhcp4/tests/@dotlibs@"
# Set env KEA_LOG_FILE_DIR to override default log path. # Set env KEA_LOG_FILE_DIR to override default log path.

3
src/bin/dhcp6/tests/dhcp6_process_tests.sh.in
View File

@@ -23,7 +23,8 @@ export KEA_LFC_EXECUTABLE="@abs_top_builddir@/src/bin/lfc/kea-lfc"
HOOK_FAIL_LOAD_PATH="@abs_top_builddir@/src/bin/dhcp6/tests/@dotlibs@libco3.so" HOOK_FAIL_LOAD_PATH="@abs_top_builddir@/src/bin/dhcp6/tests/@dotlibs@libco3.so"
# Path to test hooks library # Path to test hooks library
HOOK_FAIL_POLL_PATH="@abs_top_builddir@/src/bin/dhcp6/tests/@dotlibs@libco4.so" HOOK_FAIL_POLL_PATH="@abs_top_builddir@/src/bin/dhcp6/tests/@dotlibs@libco4.so"
# Set env KEA_HOOKS_PATH to override DEFAULT_HOOKS_PATH
# Set env KEA_HOOKS_PATH to override DEFAULT_HOOKS_PATH
export KEA_HOOKS_PATH="@abs_top_builddir@/src/bin/dhcp6/tests/@dotlibs@" export KEA_HOOKS_PATH="@abs_top_builddir@/src/bin/dhcp6/tests/@dotlibs@"
# Set env KEA_LOG_FILE_DIR to override default log path # Set env KEA_LOG_FILE_DIR to override default log path

1
src/hooks/dhcp/forensic_log/libloadtests/load_unload_unittests.cc
View File

@@ -17,6 +17,7 @@
#include <dhcpsrv/testutils/lib_load_test_fixture.h> #include <dhcpsrv/testutils/lib_load_test_fixture.h>
#include <exceptions/exceptions.h> #include <exceptions/exceptions.h>
#include <hooks/hooks_manager.h> #include <hooks/hooks_manager.h>
#include <dhcpsrv/legal_log_mgr.h>
#include <testutils/gtest_utils.h> #include <testutils/gtest_utils.h>
#ifdef HAVE_MYSQL #ifdef HAVE_MYSQL

3
src/lib/process/log_parser.cc
View File

@@ -155,7 +155,6 @@ LogConfigParser::validatePath(const std::string logpath,
return (log_path_checker_->validatePath(logpath, enforce_path)); return (log_path_checker_->validatePath(logpath, enforce_path));
} }
void LogConfigParser::parseOutputOptions(std::vector<LoggingDestination>& destination, void LogConfigParser::parseOutputOptions(std::vector<LoggingDestination>& destination,
isc::data::ConstElementPtr output_options) { isc::data::ConstElementPtr output_options) {
if (!output_options) { if (!output_options) {
@@ -182,7 +181,7 @@ void LogConfigParser::parseOutputOptions(std::vector<LoggingDestination>& destin
dest.output_ = validatePath(output_str); dest.output_ = validatePath(output_str);
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
isc_throw(BadValue, "invalid path in `output`: " << ex.what() isc_throw(BadValue, "invalid path in `output`: " << ex.what()
<< " (" << output_option->getPosition() << ")"); << " (" << output_option->getPosition() << ")");
} }
} }

2
src/lib/util/filesystem.cc
View File

@@ -257,7 +257,7 @@ PathChecker::validatePath(const std::string input_path_str,
auto filename = input_path.filename(); auto filename = input_path.filename();
if (filename.empty()) { if (filename.empty()) {
isc_throw(BadValue, "path: '" << input_path.str() << "' has no filename"); isc_throw(BadValue, "path: '" << input_path.str() << "' has no filename");
} }
auto parent_path = input_path.parentPath(); auto parent_path = input_path.parentPath();
if (!parent_path.empty()) { if (!parent_path.empty()) {