From: Francis Dupont <fdupont@isc.org>
Date: Mon, 28 Oct 2019 14:02:06 +0000 (+0100)
Subject: [fix-904-2] Fixed rebase failures
X-Git-Tag: Kea-1.7.1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dad730fc27b943379de0a42e64ebdd7fa277c32f;p=thirdparty%2Fkea.git

[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 1c408e00fb..1eca0fd666 100644
--- 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 7837afc27a..8b89e4cc60 100644
--- 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());