[#3333] use #3463 fix for radius

diff --git a/src/hooks/dhcp/ddns_tuning/.gitattributes b/src/hooks/dhcp/ddns_tuning/.gitattributes
index 1fc40e45435487617519ec4420c4eeeee901978c..078b0262465ab41ea09def6675737e13ef37e813 100644 (file)
--- a/src/hooks/dhcp/ddns_tuning/.gitattributes
+++ b/src/hooks/dhcp/ddns_tuning/.gitattributes
@@ -1,2 +1,2 @@
-/ddns_tuning_messages.cc           -diff merge=ours
-/ddns_tuning_messages.h            -diff merge=ours
+/ddns_tuning_messages.cc         -diff merge=ours
+/ddns_tuning_messages.h          -diff merge=ours

diff --git a/src/hooks/dhcp/radius/libloadtests/load_unload_unittests.cc b/src/hooks/dhcp/radius/libloadtests/load_unload_unittests.cc
index 8c8844e1c54cf2f8e361ad0723f674cf846fb4c5..5e8508eb221d81383612dcb560a06a58549274fe 100644 (file)
--- a/src/hooks/dhcp/radius/libloadtests/load_unload_unittests.cc
+++ b/src/hooks/dhcp/radius/libloadtests/load_unload_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 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
@@ -37,33 +37,38 @@ public:
     /// Removes files that may be left over from previous tests
     virtual ~RadiusLibLoadTest() {
     }
+
+    /// @brief Creates a valid set of radius parameters.
+    virtual ElementPtr validConfigParams() {
+        ElementPtr params = Element::createMap();
+        params->set("dictionary", Element::create(TEST_DICTIONARY));
+        return (params);
+    }
 };
 
 // Simple test that checks the library can be loaded and unloaded several times.
 TEST_F(RadiusLibLoadTest, validLoad) {
-    ElementPtr params = Element::createMap();
-    params->set("dictionary", Element::create(TEST_DICTIONARY));
-    validDaemonTest("kea-dhcp4", AF_INET, params);
-    validDaemonTest("kea-dhcp6", AF_INET6, params);
+    validDaemonTest("kea-dhcp4", AF_INET, valid_params_);
+    validDaemonTest("kea-dhcp6", AF_INET6, valid_params_);
 }
 
 // Simple test that checks the library cannot by loaded by invalid daemons.
 TEST_F(RadiusLibLoadTest, invalidDaemonLoad) {
     // V4 is invalid when family is AF_INET6
-    invalidDaemonTest("kea-dhcp4", AF_INET6);
+    invalidDaemonTest("kea-dhcp4", AF_INET6, valid_params_);
 
     // V6 is invalid when family is AF_INET
-    invalidDaemonTest("kea-dhcp6", AF_INET);
+    invalidDaemonTest("kea-dhcp6", AF_INET, valid_params_);
 
-    invalidDaemonTest("kea-ctrl-agent", AF_INET);
-    invalidDaemonTest("kea-dhcp-ddns", AF_INET);
-    invalidDaemonTest("bogus", AF_INET);
+    invalidDaemonTest("kea-ctrl-agent", AF_INET, valid_params_);
+    invalidDaemonTest("kea-dhcp-ddns", AF_INET, valid_params_);
+    invalidDaemonTest("bogus", AF_INET, valid_params_);
 }
 
 // Simple test that checks the library does not accept unknown parameters.
 TEST_F(RadiusLibLoadTest, unknown) {
     // Prepare parameters for the callout parameters library.
-    ElementPtr params = Element::createMap();
+    ElementPtr params = valid_params_;
     params->set("foobar", Element::create(1));
     invalidDaemonTest("kea-dhcp4", AF_INET, params);
 }