Commit dad730fc authored by Francis Dupont's avatar Francis Dupont

[fix-904-2] Fixed rebase failures

parent ec80cc4b
...@@ -278,11 +278,11 @@ public: ...@@ -278,11 +278,11 @@ public:
if (throw_during_fetch) { if (throw_during_fetch) {
expected = "{ \"result\": 1, \"text\": "; expected = "{ \"result\": 1, \"text\": ";
expected += "\"Server update failed: "; expected += "\"On demand configuration update failed: ";
expected += "testing if exceptions are corectly handled\" }"; expected += "testing if exceptions are corectly handled\" }";
} else { } else {
expected = "{ \"result\": 0, \"text\": "; expected = "{ \"result\": 0, \"text\": ";
expected += "\"Server update successful.\" }"; expected += "\"On demand configuration update successful.\" }";
} }
EXPECT_EQ(expected, result->str()); EXPECT_EQ(expected, result->str());
......
...@@ -264,11 +264,11 @@ public: ...@@ -264,11 +264,11 @@ public:
if (throw_during_fetch) { if (throw_during_fetch) {
expected = "{ \"result\": 1, \"text\": "; expected = "{ \"result\": 1, \"text\": ";
expected += "\"Server update failed: "; expected += "\"On demand configuration update failed: ";
expected += "testing if exceptions are corectly handled\" }"; expected += "testing if exceptions are corectly handled\" }";
} else { } else {
expected = "{ \"result\": 0, \"text\": "; expected = "{ \"result\": 0, \"text\": ";
expected += "\"Server update successful.\" }"; expected += "\"On demand configuration update successful.\" }";
} }
EXPECT_EQ(expected, result->str()); EXPECT_EQ(expected, result->str());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment