From 17535acfc3d0418b78c43ae75119bfc2e4a4cde6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Tue, 12 Jun 2018 21:56:46 +0300 Subject: [PATCH] Fix test failures Replaced sleep in bug676 with wait_for_monitor, removed unsupported commands from maxinfo_sql. --- maxscale-system-test/bug676.cpp | 2 +- maxscale-system-test/maxinfo_sql.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/maxscale-system-test/bug676.cpp b/maxscale-system-test/bug676.cpp index 088e9a5bd..b31715a82 100644 --- a/maxscale-system-test/bug676.cpp +++ b/maxscale-system-test/bug676.cpp @@ -26,7 +26,7 @@ int main(int argc, char *argv[]) test.stop_timeout(); test.tprintf("Waiting until the monitor picks a new master"); - sleep(5); + test.maxscales->wait_for_monitor(); test.set_timeout(30); diff --git a/maxscale-system-test/maxinfo_sql.cpp b/maxscale-system-test/maxinfo_sql.cpp index 036544965..f651b3faa 100644 --- a/maxscale-system-test/maxinfo_sql.cpp +++ b/maxscale-system-test/maxinfo_sql.cpp @@ -14,8 +14,6 @@ int main(int argc, char** argv) { vector commands( { - "SET SERVER server1 master", - "CLEAR SERVER server1 master", "FLUSH LOGS", "SHOW VARIABLES", "SHOW VARIABLES LIKE '%version%'",