From: Francis Dupont <fdupont@isc.org>
Date: Tue, 18 Apr 2017 06:01:35 +0000 (+0200)
Subject: [master] Revert "[4501] Fixed outsideSubnetPool tests where error location was moved"
X-Git-Tag: trac5087_base~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc28ed03361f57b16aa97388b224bc48e2cac551;p=thirdparty%2Fkea.git

[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 bee36f0132..9094b8fe89 100644
--- 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 584909a887..777e0147b4 100644
--- 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);
 }