hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mxs1643_extra_events

Browse Source 
The test expected the wrong results. Also updated the log message checks
to be server specific.
This commit is contained in:
Markus Mäkelä
2018-08-29 11:59:23 +03:00
parent c39177bc8d
commit c554fd3417
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
maxscale-system-test/mxs1643_extra_events.cpp
View File

@ -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;
}