From 6bd19e5c647dd9d03aec773c44b58a9c46800929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Tue, 30 May 2017 16:03:39 +0300 Subject: [PATCH] Remove post-2.0 functionality testing Removed more parts of tests that tested or expected post-2.0 functionality. --- maxscale-system-test/CMakeLists.txt | 2 +- maxscale-system-test/rw_select_insert.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt index 9aa0bf2cd..434b14a83 100644 --- a/maxscale-system-test/CMakeLists.txt +++ b/maxscale-system-test/CMakeLists.txt @@ -250,7 +250,7 @@ add_test_executable(different_size_rwsplit.cpp different_size_rwsplit replicatio add_test_executable(encrypted_passwords.cpp encrypted_passwords replication LABELS maxscale LIGHT REPL_BACKEND) # MySQL Monitor Failover Test -add_test_executable(failover_mysqlmon.cpp failover_mysqlmon failover_mysqlmon LABELS mysqlmon REPL_BACKEND) +#add_test_executable(failover_mysqlmon.cpp failover_mysqlmon failover_mysqlmon LABELS mysqlmon REPL_BACKEND) # Test monitor state change events when manually clearing server bits add_test_executable(false_monitor_state_change.cpp false_monitor_state_change replication LABELS mysqlmon REPL_BACKEND) diff --git a/maxscale-system-test/rw_select_insert.cpp b/maxscale-system-test/rw_select_insert.cpp index fd31594a6..11de0eb1c 100644 --- a/maxscale-system-test/rw_select_insert.cpp +++ b/maxscale-system-test/rw_select_insert.cpp @@ -132,7 +132,7 @@ int main(int argc, char *argv[]) Test->tprintf("Connecting to RWSplit %s\n", Test->maxscale_IP); Test->connect_rwsplit(); - Test->execute_maxadmin_command((char *) "shutdown monitor MySQL-Monitor"); + Test->execute_maxadmin_command((char *) "shutdown monitor \"MySQL Monitor\""); get_global_status_allnodes(&selects[0], &inserts[0], Test->repl, silent);