]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[#850] Addressed last comment
authorFrancis Dupont <fdupont@isc.org>
Mon, 25 Nov 2019 16:33:25 +0000 (17:33 +0100)
committerFrancis Dupont <fdupont@isc.org>
Mon, 25 Nov 2019 16:34:47 +0000 (17:34 +0100)
src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc

index c37e3fd82e524a504c202593356cf8c35e3d0f79..656bbd36937e4ab9d9c1ac7dcd2b02794ba2ddeb 100644 (file)
@@ -1632,7 +1632,11 @@ TEST(CfgSubnets4Test, iface) {
 
     // The interface check can be disabled.
     Subnet4ConfigParser parser_no_check(false);
-    EXPECT_NO_THROW(parser_no_check.parse(elems));
+    Subnet4Ptr subnet;
+    EXPECT_NO_THROW(subnet = parser_no_check.parse(elems));
+    ASSERT_TRUE(subnet);
+    EXPECT_FALSE(subnet->getIface().unspecified());
+    EXPECT_EQ("eth1", subnet->getIface().get());
 
     // Retry with the interface check enabled.
     Subnet4ConfigParser parser;
@@ -1640,8 +1644,16 @@ TEST(CfgSubnets4Test, iface) {
 
     // Configure default test interfaces.
     IfaceMgrTestConfig config(true);
-    EXPECT_NO_THROW(parser_no_check.parse(elems));
-    EXPECT_NO_THROW(parser.parse(elems));
+
+    EXPECT_NO_THROW(subnet = parser_no_check.parse(elems));
+    ASSERT_TRUE(subnet);
+    EXPECT_FALSE(subnet->getIface().unspecified());
+    EXPECT_EQ("eth1", subnet->getIface().get());
+
+    EXPECT_NO_THROW(subnet = parser.parse(elems));
+    ASSERT_TRUE(subnet);
+    EXPECT_FALSE(subnet->getIface().unspecified());
+    EXPECT_EQ("eth1", subnet->getIface().get());
 }
 
 } // end of anonymous namespace
index b987210f73802475085a9ec75300ee677d2d9c6c..b379d0ebe5e35b87c3fc205e9f399c115b7d7d64 100644 (file)
@@ -1415,7 +1415,11 @@ TEST(CfgSubnets6Test, iface) {
 
     // The interface check can be disabled.
     Subnet6ConfigParser parser_no_check(false);
-    EXPECT_NO_THROW(parser_no_check.parse(elems));
+    Subnet6Ptr subnet;
+    EXPECT_NO_THROW(subnet = parser_no_check.parse(elems));
+    ASSERT_TRUE(subnet);
+    EXPECT_FALSE(subnet->getIface().unspecified());
+    EXPECT_EQ("eth1", subnet->getIface().get());
 
     // Retry with the interface check enabled.
     Subnet6ConfigParser parser;
@@ -1423,8 +1427,16 @@ TEST(CfgSubnets6Test, iface) {
 
     // Configure default test interfaces.
     IfaceMgrTestConfig config(true);
-    EXPECT_NO_THROW(parser_no_check.parse(elems));
-    EXPECT_NO_THROW(parser.parse(elems));
+
+    EXPECT_NO_THROW(subnet = parser_no_check.parse(elems));
+    ASSERT_TRUE(subnet);
+    EXPECT_FALSE(subnet->getIface().unspecified());
+    EXPECT_EQ("eth1", subnet->getIface().get());
+
+    EXPECT_NO_THROW(subnet = parser.parse(elems));
+    ASSERT_TRUE(subnet);
+    EXPECT_FALSE(subnet->getIface().unspecified());
+    EXPECT_EQ("eth1", subnet->getIface().get());
 }
 
 } // end of anonymous namespace