[master] Revert "[4501] Fixed outsideSubnetPool tests where error location was moved"

This reverts commit 0ae26a1ab8113b4732fded2d013bb5d496c12016.

diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc
index bee36f013250f89fcb44b9499205328dca3c3bc0..9094b8fe8924923127a4aa44fd9c7e5aa7ab9d0a 100644 (file)
--- a/src/bin/dhcp4/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp4/tests/config_parser_unittest.cc
@@ -4777,10 +4777,10 @@ TEST_F(Dhcp4ParserTest, outsideSubnetPool) {
     ASSERT_NO_THROW(text = comment->stringValue());
 
     EXPECT_EQ(1, rcode);
-    string expected = "subnet configuration failed (<string>:5:14): "
+    string expected = "subnet configuration failed: "
        "a pool of type V4, with the following address range: "
        "192.0.2.1-192.0.2.100 does not match the prefix of a subnet: "
-       "10.0.2.0/24 to which it is being added";
+       "10.0.2.0/24 to which it is being added (<string>:5:14)";
     EXPECT_EQ(expected, text);
 }
 

diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc
index 584909a887b3606b8e4729f7db25cb693f6aaa3f..777e0147b4aa89eaf8e30de3d03f62a2ed856f75 100644 (file)
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@ -5270,10 +5270,10 @@ TEST_F(Dhcp6ParserTest, outsideSubnetPool) {
     ASSERT_NO_THROW(text = comment->stringValue());
 
     EXPECT_EQ(1, rcode);
-    string expected = "subnet configuration failed (<string>:6:14): "
+    string expected = "subnet configuration failed: "
         "a pool of type IA_NA, with the following address range: "
         "2001:db8::-2001:db8::ffff does not match the prefix of a subnet: "
-        "2001:dc8::/32 to which it is being added";
+        "2001:dc8::/32 to which it is being added (<string>:6:14)";
     EXPECT_EQ(expected, text);
 }