From c554fd34175ae714d6b2ffdd0dfbf2eb9756f0eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Wed, 29 Aug 2018 11:59:23 +0300 Subject: [PATCH] Fix mxs1643_extra_events The test expected the wrong results. Also updated the log message checks to be server specific. --- maxscale-system-test/mxs1643_extra_events.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/maxscale-system-test/mxs1643_extra_events.cpp b/maxscale-system-test/mxs1643_extra_events.cpp index a99b58338..886789d97 100644 --- a/maxscale-system-test/mxs1643_extra_events.cpp +++ b/maxscale-system-test/mxs1643_extra_events.cpp @@ -15,17 +15,17 @@ int main(int argc, char** argv) execute_query(test.repl->nodes[0], "SET GLOBAL read_only=ON"); test.maxscales->wait_for_monitor(); test.tprintf("Check that the current master now has the slave label"); - test.check_log_err(0, "[Master, Running] -> [Running]", true); - test.check_log_err(0, "[Master, Running] -> [Slave, Running]", false); + test.log_excludes(0, "server1.*\\[Master, Running\\] -> \\[Running\\]"); + test.log_includes(0, "server1.*\\[Master, Running\\] -> \\[Slave, Running\\]"); test.maxscales->ssh_node_f(0, true, "truncate -s 0 /var/log/maxscale/maxscale.log"); // Check that the Master and Slave status aren't both set execute_query(test.repl->nodes[0], "SET GLOBAL read_only=OFF"); test.maxscales->wait_for_monitor(); test.tprintf("Check that the new master doesn't have both slave and master labels"); - test.check_log_err(0, "[Slave, Running] -> [Master, Slave, Running]", false); - test.check_log_err(0, "[Slave, Running] -> [Master, Running]", false); - test.check_log_err(0, "[Running] -> [Master, Running]", true); + test.log_excludes(0, "server1.*\\[Slave, Running\\] -> \\[Master, Slave, Running\\]"); + test.log_excludes(0, "server1.*\\[Running\\] -> \\[Master, Running\\]"); + test.log_includes(0, "server1.*\\[Slave, Running\\] -> \\[Master, Running\\]"); return test.global_result; }