From f1a6bc37c31f786d7234fb150865e7dfde7d190e Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Thu, 23 Jul 2020 12:00:35 +0300 Subject: [PATCH] MXS-2900 Rename system tests Some of the tests have rather non-descriptive names. --- maxscale-system-test/CMakeLists.txt | 22 +++++++++---------- .../{bug143.cpp => auth_hostname.cpp} | 0 .../{bug448.cpp => auth_wchost.cpp} | 0 ...g471 => maxscale.cnf.template.rhint_basic} | 0 ...e.cnf.template.rwsplit_not_enough_servers} | 0 .../{bug471.cpp => rhint_basic.cpp} | 0 .../{bug475.cpp => rhint_comment.cpp} | 0 .../{bug473.cpp => rhint_crash.cpp} | 0 .../{bug529.cpp => router_conn_num.cpp} | 0 .../{bug547.cpp => router_slaves_blocked.cpp} | 0 ...{bug519.cpp => rwsplit_infile_outfile.cpp} | 0 ...681.cpp => rwsplit_not_enough_servers.cpp} | 0 12 files changed, 11 insertions(+), 11 deletions(-) rename maxscale-system-test/{bug143.cpp => auth_hostname.cpp} (100%) rename maxscale-system-test/{bug448.cpp => auth_wchost.cpp} (100%) rename maxscale-system-test/cnf/{maxscale.cnf.template.bug471 => maxscale.cnf.template.rhint_basic} (100%) rename maxscale-system-test/cnf/{maxscale.cnf.template.bug681 => maxscale.cnf.template.rwsplit_not_enough_servers} (100%) rename maxscale-system-test/{bug471.cpp => rhint_basic.cpp} (100%) rename maxscale-system-test/{bug475.cpp => rhint_comment.cpp} (100%) rename maxscale-system-test/{bug473.cpp => rhint_crash.cpp} (100%) rename maxscale-system-test/{bug529.cpp => router_conn_num.cpp} (100%) rename maxscale-system-test/{bug547.cpp => router_slaves_blocked.cpp} (100%) rename maxscale-system-test/{bug519.cpp => rwsplit_infile_outfile.cpp} (100%) rename maxscale-system-test/{bug681.cpp => rwsplit_not_enough_servers.cpp} (100%) diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt index 29d679d3e..79c5fabf6 100644 --- a/maxscale-system-test/CMakeLists.txt +++ b/maxscale-system-test/CMakeLists.txt @@ -65,31 +65,31 @@ add_test_executable(sanity_check.cpp sanity_check replication LABELS LIGHT REPL_ add_test_executable(backend_auth_fail.cpp backend_auth_fail replication LABELS readconnroute REPL_BACKEND) # Regression case for the bug "MaxScale ignores host in user authentication" -add_test_executable(bug143.cpp bug143 replication LABELS MySQLAuth REPL_BACKEND) +add_test_executable(auth_hostname.cpp auth_hostname replication LABELS MySQLAuth REPL_BACKEND) # Regression case for the bug "Wildcard in host column of mysql.user table don't work properly" -add_test_executable(bug448.cpp bug448 replication LABELS MySQLAuth LIGHT REPL_BACKEND) +add_test_executable(auth_wchost.cpp auth_wchost replication LABELS MySQLAuth LIGHT REPL_BACKEND) # Regression case for the bug "Routing Hints route to server sometimes doesn't work" -add_test_executable(bug471.cpp bug471 bug471 LABELS readwritesplit hintfilter REPL_BACKEND) +add_test_executable(rhint_basic.cpp rhint_basic rhint_basic LABELS readwritesplit hintfilter REPL_BACKEND) # Regression case for the bugs "malformed hints cause crash" -add_test_executable(bug473.cpp bug473 hints LABELS readwritesplit hintfilter REPL_BACKEND) +add_test_executable(rhint_crash.cpp rhint_crash hints LABELS readwritesplit hintfilter REPL_BACKEND) # Regression case for the bug "The end comment tag in hints isn't properly detected" -add_test_executable(bug475.cpp bug475 hints LABELS readwritesplit hintfilter REPL_BACKEND) +add_test_executable(rhint_comment.cpp rhint_comment hints LABELS readwritesplit hintfilter REPL_BACKEND) # Checks "SELECT * INTO OUTFILE" and "LOAD DATA LOCAL INFILE" -add_test_executable(bug519.cpp bug519 replication LABELS readwritesplit REPL_BACKEND) +add_test_executable(rwsplit_infile_outfile.cpp rwsplit_infile_outfile replication LABELS readwritesplit REPL_BACKEND) # Regression case for the bug "'Current no. of conns' not going down" -add_test_executable(bug529.cpp bug529 replication LABELS readwritesplit readconnroute maxscale REPL_BACKEND) +add_test_executable(router_conn_num.cpp router_conn_num replication LABELS readwritesplit readconnroute maxscale REPL_BACKEND) -# Regression case for the bugs "get_dcb fails if slaves are not available" and "Maxscale fails to start without anything in the logs if there is no slave available" -add_test_executable(bug547.cpp bug547 replication LABELS readwritesplit REPL_BACKEND) +# Regression: Crash if no slave available +add_test_executable(router_slaves_blocked.cpp router_slaves_blocked replication LABELS readwritesplit REPL_BACKEND) # Regression case for the bug "crash if max_slave_connections=10% and 4 or less backends are configured" -add_test_executable(bug681.cpp bug681 bug681 LABELS readwritesplit REPL_BACKEND) +add_test_executable(rwsplit_not_enough_servers.cpp rwsplit_not_enough_servers rwsplit_not_enough_servers LABELS readwritesplit REPL_BACKEND) # Regression case for the bug ""Different error messages from MariaDB and Maxscale" add_test_executable(error_messages.cpp error_messages replication LABELS MySQLAuth REPL_BACKEND) @@ -1057,7 +1057,7 @@ add_test_derived(bug585_big bug587 bug585 LABELS regexfilter BIG_REPL_BACKEND RE add_test_derived(bug587_big bug587 bug587 LABELS regexfilter hintfilter BIG_REPL_BACKEND REPL_BACKEND UNSTABLE HEAVY) add_test_derived(bug587_1_big bug587 bug587_1 LABELS regexfilter hintfilter BIG_REPL_BACKEND REPL_BACKEND UNSTABLE HEAVY) # Regression case for the bug "Routing Hints route to server sometimes doesn't work" -add_test_derived(bug471_big bug471 bug471_big LABELS readwritesplit hintfilter BIG_REPL_BACKEND REPL_BACKEND UNSTABLE HEAVY) +add_test_derived(bug471_big rhint_basic bug471_big LABELS readwritesplit hintfilter BIG_REPL_BACKEND REPL_BACKEND UNSTABLE HEAVY) set_tests_properties(different_size_rwsplit_big PROPERTIES TIMEOUT 3600) set_tests_properties(different_size_rwsplit PROPERTIES TIMEOUT 3600) diff --git a/maxscale-system-test/bug143.cpp b/maxscale-system-test/auth_hostname.cpp similarity index 100% rename from maxscale-system-test/bug143.cpp rename to maxscale-system-test/auth_hostname.cpp diff --git a/maxscale-system-test/bug448.cpp b/maxscale-system-test/auth_wchost.cpp similarity index 100% rename from maxscale-system-test/bug448.cpp rename to maxscale-system-test/auth_wchost.cpp diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug471 b/maxscale-system-test/cnf/maxscale.cnf.template.rhint_basic similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug471 rename to maxscale-system-test/cnf/maxscale.cnf.template.rhint_basic diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug681 b/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_not_enough_servers similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug681 rename to maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_not_enough_servers diff --git a/maxscale-system-test/bug471.cpp b/maxscale-system-test/rhint_basic.cpp similarity index 100% rename from maxscale-system-test/bug471.cpp rename to maxscale-system-test/rhint_basic.cpp diff --git a/maxscale-system-test/bug475.cpp b/maxscale-system-test/rhint_comment.cpp similarity index 100% rename from maxscale-system-test/bug475.cpp rename to maxscale-system-test/rhint_comment.cpp diff --git a/maxscale-system-test/bug473.cpp b/maxscale-system-test/rhint_crash.cpp similarity index 100% rename from maxscale-system-test/bug473.cpp rename to maxscale-system-test/rhint_crash.cpp diff --git a/maxscale-system-test/bug529.cpp b/maxscale-system-test/router_conn_num.cpp similarity index 100% rename from maxscale-system-test/bug529.cpp rename to maxscale-system-test/router_conn_num.cpp diff --git a/maxscale-system-test/bug547.cpp b/maxscale-system-test/router_slaves_blocked.cpp similarity index 100% rename from maxscale-system-test/bug547.cpp rename to maxscale-system-test/router_slaves_blocked.cpp diff --git a/maxscale-system-test/bug519.cpp b/maxscale-system-test/rwsplit_infile_outfile.cpp similarity index 100% rename from maxscale-system-test/bug519.cpp rename to maxscale-system-test/rwsplit_infile_outfile.cpp diff --git a/maxscale-system-test/bug681.cpp b/maxscale-system-test/rwsplit_not_enough_servers.cpp similarity index 100% rename from maxscale-system-test/bug681.cpp rename to maxscale-system-test/rwsplit_not_enough_servers.cpp