From: Tomek Mrugalski Date: Tue, 9 Oct 2018 19:24:44 +0000 (+0200) Subject: [#30] Minor unit-tests correction. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8da630abededd64ab785e118d9099a7b9bd6d4d2;p=thirdparty%2Fkea.git [#30] Minor unit-tests correction. --- diff --git a/src/bin/d2/tests/d2_command_unittest.cc b/src/bin/d2/tests/d2_command_unittest.cc index 6897c6d13c..a72c0049fd 100644 --- a/src/bin/d2/tests/d2_command_unittest.cc +++ b/src/bin/d2/tests/d2_command_unittest.cc @@ -684,7 +684,7 @@ TEST_F(CtrlChannelD2Test, configTest) { ASSERT_TRUE(proc); ConstElementPtr answer = proc->configure(config, false); ASSERT_TRUE(answer); - EXPECT_EQ("{ \"result\": 0, \"text\": \"Configuration committed.\" }", + EXPECT_EQ("{ \"result\": 0, \"text\": \"Configuration applied successfully.\" }", answer->str()); // Check that the config was indeed applied. @@ -717,7 +717,7 @@ TEST_F(CtrlChannelD2Test, configTest) { sendUnixCommand(os.str(), response); // Should fail with a syntax error. - EXPECT_EQ("{ \"result\": 1, \"text\": \"element: tsig-keys : missing parameter 'name' (:9:14):8:23\" }", + EXPECT_EQ("{ \"result\": 1, \"text\": \"missing parameter 'name' (:9:14)\" }", response); // Check that the config was not lost. @@ -748,7 +748,7 @@ TEST_F(CtrlChannelD2Test, configTest) { EXPECT_TRUE(test::fileExists(socket_path_)); // Verify the configuration was successful. - EXPECT_EQ("{ \"result\": 0, \"text\": \"Configuration seems sane.\" }", + EXPECT_EQ("{ \"result\": 0, \"text\": \"Configuration check successful\" }", response); // Check that the config was not applied.