From b7fdaf0340a35853307629e6296e0002a0966f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Wed, 27 Jun 2018 00:11:12 +0300 Subject: [PATCH] Use wait_for_monitor in mxs1643_extra_events Replace hard-coded sleeps in mxs1643_extra_events with Maxscales::wait_for_monitor. --- maxscale-system-test/mxs1643_extra_events.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maxscale-system-test/mxs1643_extra_events.cpp b/maxscale-system-test/mxs1643_extra_events.cpp index 389a1dddd..628172653 100644 --- a/maxscale-system-test/mxs1643_extra_events.cpp +++ b/maxscale-system-test/mxs1643_extra_events.cpp @@ -14,18 +14,18 @@ int main(int argc, char** argv) test.tprintf("Set master into read-only mode"); test.repl->connect(); execute_query(test.repl->nodes[0], "SET GLOBAL read_only=ON"); - sleep(10); + 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]", false); test.check_log_err(0, "[Master, Running] -> [Slave, Running]", true); execute_query(test.repl->nodes[0], "SET GLOBAL read_only=OFF"); - sleep(5); + test.maxscales->wait_for_monitor(); 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 test.tprintf("Block master and wait for monitor to detect it."); test.repl->block_node(0); - sleep(10); + 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]", true);