From dad730fc27b943379de0a42e64ebdd7fa277c32f Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Mon, 28 Oct 2019 15:02:06 +0100 Subject: [PATCH] [fix-904-2] Fixed rebase failures --- src/bin/dhcp4/tests/kea_controller_unittest.cc | 4 ++-- src/bin/dhcp6/tests/kea_controller_unittest.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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()); -- GitLab