[#4432] fix unit tests

diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc
index bb0370555190da611fe7d5a895b1615502262eac..af9d3e5f16de1c378ac9dd73ac11bc5778251c1d 100644 (file)
--- a/src/bin/dhcp4/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp4/tests/config_parser_unittest.cc
@@ -419,7 +419,7 @@ public:
         // Socket name too long?
         bool const too_long(SocketPath::isTooLongFromConfig(json));
         if (too_long) {
-            EXPECT_EQ(CONTROL_RESULT_ERROR, rcode);
+            EXPECT_EQ(CONTROL_RESULT_FATAL_ERROR, rcode);
             exp_error = "name too long";
             EXPECT_NE(std::string::npos, text.find(exp_error));
             return;

diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc b/src/bin/dhcp4/tests/get_config_unittest.cc
index 8a9d0d62e981a142e8996c4f9c96ee6333d0335b..c024e91d9344525ca39210fbc5407f54050aa111 100644 (file)
--- a/src/bin/dhcp4/tests/get_config_unittest.cc
+++ b/src/bin/dhcp4/tests/get_config_unittest.cc
@@ -14655,7 +14655,7 @@ public:
 
             bool const too_long(SocketPath::isTooLongFromConfig(json));
             if (too_long) {
-                EXPECT_EQ(CONTROL_RESULT_ERROR, rcode_);
+                EXPECT_EQ(CONTROL_RESULT_FATAL_ERROR, rcode_);
                 string const exp_error("name too long");
                 string const error(comment_->stringValue());
                 EXPECT_NE(std::string::npos, error.find(exp_error));

diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc.skel b/src/bin/dhcp4/tests/get_config_unittest.cc.skel
index 832795911a95d87b39c8fed76ee634e50ca30796..2f03dc546a6019805393ce7a77ac3f31aa4cb1e2 100644 (file)
--- a/src/bin/dhcp4/tests/get_config_unittest.cc.skel
+++ b/src/bin/dhcp4/tests/get_config_unittest.cc.skel
@@ -253,7 +253,7 @@ public:
 
             bool const too_long(SocketPath::isTooLongFromConfig(json));
             if (too_long) {
-                EXPECT_EQ(CONTROL_RESULT_ERROR, rcode_);
+                EXPECT_EQ(CONTROL_RESULT_FATAL_ERROR, rcode_);
                 string const exp_error("name too long");
                 string const error(comment_->stringValue());
                 EXPECT_NE(std::string::npos, error.find(exp_error));

diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc
index f7cf1dbf0880f996c206ba2ffb6256e3454ce827..f88283b2717c5d8068a29f3458d0bbfa6f87a690 100644 (file)
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@ -505,7 +505,7 @@ public:
         // Socket name too long?
         bool const too_long(SocketPath::isTooLongFromConfig(json));
         if (too_long) {
-            EXPECT_EQ(CONTROL_RESULT_ERROR, rcode);
+            EXPECT_EQ(CONTROL_RESULT_FATAL_ERROR, rcode);
             exp_error = "name too long";
             EXPECT_NE(std::string::npos, text.find(exp_error));
             return;

diff --git a/src/bin/dhcp6/tests/get_config_unittest.cc b/src/bin/dhcp6/tests/get_config_unittest.cc
index 01e83bf58f36c5bcc9acb2e05b4f0ab27bd41a77..b7a7259189dbf37a8ece06b3477defbe66d6fcf6 100644 (file)
--- a/src/bin/dhcp6/tests/get_config_unittest.cc
+++ b/src/bin/dhcp6/tests/get_config_unittest.cc
@@ -14973,7 +14973,7 @@ public:
 
             bool const too_long(SocketPath::isTooLongFromConfig(json));
             if (too_long) {
-                EXPECT_EQ(CONTROL_RESULT_ERROR, rcode_);
+                EXPECT_EQ(CONTROL_RESULT_FATAL_ERROR, rcode_);
                 string const exp_error("name too long");
                 string const error(comment_->stringValue());
                 EXPECT_NE(std::string::npos, error.find(exp_error));

diff --git a/src/bin/dhcp6/tests/get_config_unittest.cc.skel b/src/bin/dhcp6/tests/get_config_unittest.cc.skel
index d6a5df440685ef930082c72f476ecaead7a2363e..c384a510b17f43b5c39a7039df2f52653d6c201c 100644 (file)
--- a/src/bin/dhcp6/tests/get_config_unittest.cc.skel
+++ b/src/bin/dhcp6/tests/get_config_unittest.cc.skel
@@ -253,8 +253,7 @@ public:
 
             bool const too_long(SocketPath::isTooLongFromConfig(json));
             if (too_long) {
-                EXPECT_EQ(CONTROL_RESULT_ERROR, rcode_);
-
+                EXPECT_EQ(CONTROL_RESULT_FATAL_ERROR, rcode_);
                 string const exp_error("name too long");
                 string const error(comment_->stringValue());
                 EXPECT_NE(std::string::npos, error.find(exp_error));