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

MXS-2900 Move more monitor tests to dedicated directory

Browse Source 
These tests were added in 2.4.
This commit is contained in:
Esa Korhonen
2020-05-04 21:54:53 +03:00
parent 06bd6f1812
commit 910cee3538
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
maxscale-system-test/CMakeLists.txt
View File

@ -207,12 +207,6 @@ add_test_executable(mxs2355_wrong_auth.cpp mxs2355_wrong_auth maxctrl LABELS REP
add_subdirectory(mariadbmonitor) 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 # MXS-1506: Delayed query retry
# https://jira.mariadb.org/browse/MXS-1506 # https://jira.mariadb.org/browse/MXS-1506
add_test_executable(mxs1506_delayed_retry.cpp mxs1506_delayed_retry mxs1506_delayed_retry LABELS readwritesplit REPL_BACKEND) add_test_executable(mxs1506_delayed_retry.cpp mxs1506_delayed_retry mxs1506_delayed_retry LABELS readwritesplit REPL_BACKEND)

8
maxscale-system-test/mariadbmonitor/CMakeLists.txt
View File

@ -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 # 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 add_test_executable_ex(NAME verify_master_failure SOURCE verify_master_failure.cpp
CONFIG verify_master_failure.cnf VMS repl_backend LABELS mysqlmon) 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)

0
maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_enforce_simple → maxscale-system-test/mariadbmonitor/mysqlmon_enforce_simple.cnf
View File

0
maxscale-system-test/mysqlmon_enforce_simple.cpp → maxscale-system-test/mariadbmonitor/mysqlmon_enforce_simple.cpp
View File

0
maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_fail_switch_multi → maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_multi.cnf
View File

0
maxscale-system-test/mysqlmon_fail_switch_multi.cpp → maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_multi.cpp
View File