[#4483] addressed review comments

diff --git a/doc/sphinx/kea-messages.rst b/doc/sphinx/kea-messages.rst
index dd2d3d8050303b6163bcb4d75ae39044ebe474ea..2779ef00e348a603ce3c4bc42b2407a56d430cf8 100644 (file)
--- a/doc/sphinx/kea-messages.rst
+++ b/doc/sphinx/kea-messages.rst
@@ -9887,12 +9887,13 @@ DHCPSRV_MEMFILE_LFC_SPAWN_FAIL
 
     lease file cleanup failed to run because kea-lfc process couldn't be spawned
 
-This error message is logged when the Kea server fails to run kea-lfc,
-the program that cleans up the lease file. The server will try again the
-next time a lease file cleanup is scheduled. Although this message should
-not appear and the reason why it did investigated, the occasional failure
-to start the lease file cleanup will not impact operations. Should the
-failure persist however, the size of the lease file will increase without bound.
+This error message is logged when the Kea server fails to run kea-lfc, the
+program that cleans up the lease file. The server will try again the next
+time a lease file cleanup is scheduled. Although this message should not
+appear and the reason why it did should be investigated, the occasional
+failure to start the lease file cleanup will not impact operations. Should
+the failure persist however, the size of the lease file will increase without
+bound.
 
 DHCPSRV_MEMFILE_LFC_START
 =========================

diff --git a/meson.build b/meson.build
index 90d3a58e57e05ea42eb22b6ecc35e0b8c064a8df..0f03943bc75dbdb64c55598b992d31ca4598a6d9 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -990,6 +990,7 @@ endif
 if valgrind.found()
     add_test_setup(
         'valgrind',
+        timeout_multiplier=4,
         exe_wrapper: [
             valgrind,
             '--error-exitcode=0',
@@ -1006,6 +1007,7 @@ if valgrind.found()
     )
     add_test_setup(
         'valgrind_gen_suppressions',
+        timeout_multiplier=4,
         exe_wrapper: [
             valgrind,
             '--error-exitcode=0',

diff --git a/src/bin/dhcp4/tests/fqdn_unittest.cc b/src/bin/dhcp4/tests/fqdn_unittest.cc
index 2b924d8e9eaa1ade020d7ce8d23c9572d0f0fd3d..04786e723acc6c8dc0c42b400af8ecb2cbce7aeb 100644 (file)
--- a/src/bin/dhcp4/tests/fqdn_unittest.cc
+++ b/src/bin/dhcp4/tests/fqdn_unittest.cc
@@ -2911,7 +2911,7 @@ TEST_F(NameDhcpv4SrvTest, withOfferLifetime) {
     EXPECT_TRUE(lease->fqdn_rev_);
     EXPECT_EQ("client-name.example.com.", lease->hostname_);
 
-    // Verify assigned states did not incremented again.
+    // Verify assigned states did not increment again.
     checkSubnetStat(subnet->getID(), "total-addresses", 1);
     checkSubnetStat(subnet->getID(), "cumulative-assigned-addresses", 1);
     checkSubnetStat(subnet->getID(), "assigned-addresses", 1);

diff --git a/src/bin/perfdhcp/command_options.cc b/src/bin/perfdhcp/command_options.cc
index 6d9599785045b13ad84247685fdf01ba027397a1..71159222777f1767e110b9f269204a20c05c1838 100644 (file)
--- a/src/bin/perfdhcp/command_options.cc
+++ b/src/bin/perfdhcp/command_options.cc
@@ -692,7 +692,7 @@ CommandOptions::initialize(int argc, char** argv, bool print_cmd_line) {
     // and REQUEST/REPLY exchanges make sure we have transaction id
     // and random duid offsets for both exchanges. We will duplicate
     // value specified as -X<value> and -R<value> for second
-    // exchange if user did not specified otherwise.
+    // exchange if user did not specify otherwise.
     if (template_file_.size() > 1) {
         if (xid_offset_.size() == 1) {
             xid_offset_.push_back(xid_offset_[0]);

diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes
index b653f27aa8fdefd7cf39d7927f294ae7627b4130..17e0b7a641feb8ded61624b898c35653d4b0a370 100644 (file)
--- a/src/lib/dhcpsrv/dhcpsrv_messages.mes
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes
@@ -775,12 +775,13 @@ configures the LFC to be executed periodically. The argument holds the
 interval in seconds in which the LFC will be executed.
 
 % DHCPSRV_MEMFILE_LFC_SPAWN_FAIL lease file cleanup failed to run because kea-lfc process couldn't be spawned
-This error message is logged when the Kea server fails to run kea-lfc,
-the program that cleans up the lease file. The server will try again the
-next time a lease file cleanup is scheduled. Although this message should
-not appear and the reason why it did investigated, the occasional failure
-to start the lease file cleanup will not impact operations. Should the
-failure persist however, the size of the lease file will increase without bound.
+This error message is logged when the Kea server fails to run kea-lfc, the
+program that cleans up the lease file. The server will try again the next
+time a lease file cleanup is scheduled. Although this message should not
+appear and the reason why it did should be investigated, the occasional
+failure to start the lease file cleanup will not impact operations. Should
+the failure persist however, the size of the lease file will increase without
+bound.
 
 % DHCPSRV_MEMFILE_LFC_START starting Lease File Cleanup
 An informational message issued when the Memfile lease database backend

diff --git a/src/lib/dhcpsrv/tests/shared_network_unittest.cc b/src/lib/dhcpsrv/tests/shared_network_unittest.cc
index 1e5a4c43998fa72e0014c64268aa34036a45db1c..9192b02aea83af95a0e0bb0d4f4fa73310c1461a 100644 (file)
--- a/src/lib/dhcpsrv/tests/shared_network_unittest.cc
+++ b/src/lib/dhcpsrv/tests/shared_network_unittest.cc
@@ -228,7 +228,7 @@ TEST(SharedNetwork4Test, replaceSubnet4) {
                              SubnetID(2)));
     EXPECT_FALSE(network->replace(subnet));
 
-    // Subnets did not changed.
+    // Subnets did not change.
     ASSERT_EQ(3, network->getAllSubnets()->size());
     auto returned_it = network->getAllSubnets()->begin();
     Subnet4Ptr returned_subnet = *returned_it;
@@ -272,7 +272,7 @@ TEST(SharedNetwork4Test, replaceSubnet4) {
     EXPECT_TRUE(network1);
     EXPECT_TRUE(network == network1);
 
-    // Other subnets did not changed.
+    // Other subnets did not change.
     returned_it = network->getAllSubnets()->begin();
     returned_subnet = *++returned_it;
     ASSERT_TRUE(returned_subnet);
@@ -975,7 +975,7 @@ TEST(SharedNetwork6Test, replaceSubnet6) {
                              SubnetID(2)));
     EXPECT_FALSE(network->replace(subnet));
 
-    // Subnets did not changed.
+    // Subnets did not change.
     ASSERT_EQ(3, network->getAllSubnets()->size());
     auto returned_it = network->getAllSubnets()->begin();
     Subnet6Ptr returned_subnet = *returned_it;
@@ -1021,7 +1021,7 @@ TEST(SharedNetwork6Test, replaceSubnet6) {
     EXPECT_TRUE(network1);
     EXPECT_TRUE(network == network1);
 
-    // Other subnets did not changed.
+    // Other subnets did not change.
     returned_it = network->getAllSubnets()->begin();
     returned_subnet = *++returned_it;
     ASSERT_TRUE(returned_subnet);