From: Francis Dupont Date: Tue, 18 Apr 2017 05:21:47 +0000 (+0200) Subject: [4501] Fixed outsideSubnetPool tests where error location was moved X-Git-Tag: trac5087_base~2^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ae26a1ab8113b4732fded2d013bb5d496c12016;p=thirdparty%2Fkea.git [4501] Fixed outsideSubnetPool tests where error location was moved --- diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc index ba780be6db..675685f432 100644 --- a/src/bin/dhcp4/tests/config_parser_unittest.cc +++ b/src/bin/dhcp4/tests/config_parser_unittest.cc @@ -4746,10 +4746,10 @@ TEST_F(Dhcp4ParserTest, outsideSubnetPool) { ASSERT_NO_THROW(text = comment->stringValue()); EXPECT_EQ(1, rcode); - string expected = "subnet configuration failed: " + string expected = "subnet configuration failed (:5:14): " "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 (:5:14)"; + "10.0.2.0/24 to which it is being added"; 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 c066e8a93b..0a80a73524 100644 --- a/src/bin/dhcp6/tests/config_parser_unittest.cc +++ b/src/bin/dhcp6/tests/config_parser_unittest.cc @@ -5219,10 +5219,10 @@ TEST_F(Dhcp6ParserTest, outsideSubnetPool) { ASSERT_NO_THROW(text = comment->stringValue()); EXPECT_EQ(1, rcode); - string expected = "subnet configuration failed: " + string expected = "subnet configuration failed (:6:14): " "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 (:6:14)"; + "2001:dc8::/32 to which it is being added"; EXPECT_EQ(expected, text); }