From 910cee3538302e4524755ae8e5642eed6d4d26ce Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Mon, 4 May 2020 21:54:53 +0300 Subject: [PATCH] MXS-2900 Move more monitor tests to dedicated directory These tests were added in 2.4. --- maxscale-system-test/CMakeLists.txt | 6 ------ maxscale-system-test/mariadbmonitor/CMakeLists.txt | 8 ++++++++ .../mysqlmon_enforce_simple.cnf} | 0 .../{ => mariadbmonitor}/mysqlmon_enforce_simple.cpp | 0 .../mysqlmon_fail_switch_multi.cnf} | 0 .../{ => mariadbmonitor}/mysqlmon_fail_switch_multi.cpp | 0 6 files changed, 8 insertions(+), 6 deletions(-) rename maxscale-system-test/{cnf/maxscale.cnf.template.mysqlmon_enforce_simple => mariadbmonitor/mysqlmon_enforce_simple.cnf} (100%) rename maxscale-system-test/{ => mariadbmonitor}/mysqlmon_enforce_simple.cpp (100%) rename maxscale-system-test/{cnf/maxscale.cnf.template.mysqlmon_fail_switch_multi => mariadbmonitor/mysqlmon_fail_switch_multi.cnf} (100%) rename maxscale-system-test/{ => mariadbmonitor}/mysqlmon_fail_switch_multi.cpp (100%) diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt index d564ccffd..94502aceb 100644 --- a/maxscale-system-test/CMakeLists.txt +++ b/maxscale-system-test/CMakeLists.txt @@ -207,12 +207,6 @@ add_test_executable(mxs2355_wrong_auth.cpp mxs2355_wrong_auth maxctrl LABELS REP add_subdirectory(mariadbmonitor) -# MariaDB-Monitor enforce_simple_topology -add_test_executable(mysqlmon_enforce_simple.cpp mysqlmon_enforce_simple mysqlmon_enforce_simple LABELS mysqlmon REPL_BACKEND) - -# MariaDB-Monitor multimaster failover/switchover -add_test_executable(mysqlmon_fail_switch_multi.cpp mysqlmon_fail_switch_multi mysqlmon_fail_switch_multi LABELS mysqlmon REPL_BACKEND) - # MXS-1506: Delayed query retry # https://jira.mariadb.org/browse/MXS-1506 add_test_executable(mxs1506_delayed_retry.cpp mxs1506_delayed_retry mxs1506_delayed_retry LABELS readwritesplit REPL_BACKEND) diff --git a/maxscale-system-test/mariadbmonitor/CMakeLists.txt b/maxscale-system-test/mariadbmonitor/CMakeLists.txt index d5971e14e..3744dee26 100644 --- a/maxscale-system-test/mariadbmonitor/CMakeLists.txt +++ b/maxscale-system-test/mariadbmonitor/CMakeLists.txt @@ -99,3 +99,11 @@ add_test_executable_ex(NAME mysqlmon_failover_readonly SOURCE mysqlmon_failover_ # MXS-1493: Use replication heartbeat in mysqlmon https://jira.mariadb.org/browse/MXS-1493 add_test_executable_ex(NAME verify_master_failure SOURCE verify_master_failure.cpp CONFIG verify_master_failure.cnf VMS repl_backend LABELS mysqlmon) + +# MariaDB-Monitor enforce_simple_topology +add_test_executable_ex(NAME mysqlmon_enforce_simple SOURCE mysqlmon_enforce_simple.cpp + CONFIG mysqlmon_enforce_simple.cnf VMS repl_backend LABELS mysqlmon) + +# MariaDB-Monitor multimaster failover/switchover +add_test_executable_ex(NAME mysqlmon_fail_switch_multi SOURCE mysqlmon_fail_switch_multi.cpp + CONFIG mysqlmon_fail_switch_multi.cnf VMS repl_backend LABELS mysqlmon) \ No newline at end of file diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_enforce_simple b/maxscale-system-test/mariadbmonitor/mysqlmon_enforce_simple.cnf similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_enforce_simple rename to maxscale-system-test/mariadbmonitor/mysqlmon_enforce_simple.cnf diff --git a/maxscale-system-test/mysqlmon_enforce_simple.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_enforce_simple.cpp similarity index 100% rename from maxscale-system-test/mysqlmon_enforce_simple.cpp rename to maxscale-system-test/mariadbmonitor/mysqlmon_enforce_simple.cpp diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_fail_switch_multi b/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_multi.cnf similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_fail_switch_multi rename to maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_multi.cnf diff --git a/maxscale-system-test/mysqlmon_fail_switch_multi.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_multi.cpp similarity index 100% rename from maxscale-system-test/mysqlmon_fail_switch_multi.cpp rename to maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_multi.cpp