[274-possible-improvements-to-dhcp-queue-control-member-parsing] Upgraded dhcpQueueCo...

diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc
index 2b1627680664a964ed432290cb68f2177d21537b..14a935e23d7c52f0c07877a1b32a0d9eff192d47 100644 (file)
--- a/src/bin/dhcp4/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp4/tests/config_parser_unittest.cc
@@ -6892,14 +6892,16 @@ TEST_F(Dhcp4ParserTest, dhcpQueueControlInvalid) {
         "{ \n"
         "   \"enable-type\": \"some-type\" \n"
         "} \n",
-        "<string>:2.2-21: 'enable-queue' is required: (<string>:2:24)"
+        "missing parameter 'enable-queue' (<string>:2:2) "
+        "[dhcp-queue-control map between <string>:2:24 and <string>:4:1]"
         },
         {
         "enable-queue not boolean",
         "{ \n"
         "   \"enable-queue\": \"always\" \n"
         "} \n",
-        "<string>:2.2-21: 'enable-queue' must be boolean: (<string>:2:24)"
+        "<string>:3.20-27: syntax error, unexpected constant string, "
+        "expecting boolean"
         },
         {
         "queue enabled, type not a string",
@@ -6907,7 +6909,8 @@ TEST_F(Dhcp4ParserTest, dhcpQueueControlInvalid) {
         "   \"enable-queue\": true, \n"
         "   \"queue-type\": 7777 \n"
         "} \n",
-        "<string>:2.2-21: 'queue-type' must be a string: (<string>:2:24)"
+        "<string>:4.18-21: syntax error, unexpected integer, "
+        "expecting constant string"
         }
     };
 

diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc
index fca45ccf9ffb9d2ba6ed6391f7be583886a73647..612756041fd6b4ea0407c7ae8f2aafcf33ed42d4 100644 (file)
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@ -7599,14 +7599,16 @@ TEST_F(Dhcp6ParserTest, dhcpQueueControlInvalid) {
         "{ \n"
         "   \"enable-type\": \"some-type\" \n"
         "} \n",
-        "<string>:2.2-21: 'enable-queue' is required: (<string>:2:24)"
+        "missing parameter 'enable-queue' (<string>:2:2) "
+        "[dhcp-queue-control map between <string>:2:24 and <string>:4:1]"
         },
         {
         "enable-queue not boolean",
         "{ \n"
         "   \"enable-queue\": \"always\" \n"
         "} \n",
-        "<string>:2.2-21: 'enable-queue' must be boolean: (<string>:2:24)"
+        "<string>:3.20-27: syntax error, unexpected constant string, "
+        "expecting boolean"
         },
         {
         "queue type not a string",
@@ -7614,7 +7616,8 @@ TEST_F(Dhcp6ParserTest, dhcpQueueControlInvalid) {
         "   \"enable-queue\": true, \n"
         "   \"queue-type\": 7777 \n"
         "} \n",
-        "<string>:2.2-21: 'queue-type' must be a string: (<string>:2:24)"
+        "<string>:4.18-21: syntax error, unexpected integer, "
+        "expecting constant string"
         }
     };