[fix-904-2] Fixed rebase failures

diff --git a/src/bin/dhcp4/tests/kea_controller_unittest.cc b/src/bin/dhcp4/tests/kea_controller_unittest.cc
index 1c408e00fb4716db96dfdb56fa7b2b53af8b587f..1eca0fd66610dc358c3f54f53ae8706622a1dff4 100644 (file)
--- a/src/bin/dhcp4/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp4/tests/kea_controller_unittest.cc
@@ -278,11 +278,11 @@ public:
 
             if (throw_during_fetch) {
                 expected = "{ \"result\": 1, \"text\": ";
-                expected += "\"Server update failed: ";
+                expected += "\"On demand configuration update failed: ";
                 expected += "testing if exceptions are corectly handled\" }";
             } else {
                 expected = "{ \"result\": 0, \"text\": ";
-                expected += "\"Server update successful.\" }";
+                expected += "\"On demand configuration update successful.\" }";
             }
             EXPECT_EQ(expected, result->str());
 

diff --git a/src/bin/dhcp6/tests/kea_controller_unittest.cc b/src/bin/dhcp6/tests/kea_controller_unittest.cc
index 7837afc27aeafa674a77a193e6577d35ac496ea6..8b89e4cc600cec80ea7368540a5e037f093b4a56 100644 (file)
--- a/src/bin/dhcp6/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp6/tests/kea_controller_unittest.cc
@@ -264,11 +264,11 @@ public:
 
             if (throw_during_fetch) {
                 expected = "{ \"result\": 1, \"text\": ";
-                expected += "\"Server update failed: ";
+                expected += "\"On demand configuration update failed: ";
                 expected += "testing if exceptions are corectly handled\" }";
             } else {
                 expected = "{ \"result\": 0, \"text\": ";
-                expected += "\"Server update successful.\" }";
+                expected += "\"On demand configuration update successful.\" }";
             }
             EXPECT_EQ(expected, result->str());