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

Fix and disable 2.0 related tests

Browse Source 
Fixed the expected script output for the script test.

The SSL load balancing test would fail due to a problem introduced in
connector-c 3.0 which is yet to be resolved. Due to this, the test is
disabled until an alternative way to test it is conceived.

The dbfwfilter duplicate rule detection is fixed in 2.1.
This commit is contained in:
Markus Mäkelä
2017-05-31 09:21:13 +03:00
parent 6bd19e5c64
commit f2ba9dbed8
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,7 +258,7 @@ add_test_executable(false_monitor_state_change.cpp false_monitor_state_change re
# A set of tests for Firewall filter # A set of tests for Firewall filter
add_test_executable(fwf.cpp fwf fwf LABELS dbfwfilter REPL_BACKEND) add_test_executable(fwf.cpp fwf fwf LABELS dbfwfilter REPL_BACKEND)
#add_test_executable(fwf2.cpp fwf2 fwf LABELS dbfwfilter REPL_BACKEND) #add_test_executable(fwf2.cpp fwf2 fwf LABELS dbfwfilter REPL_BACKEND)
add_test_executable(fwf_duplicate_rules.cpp fwf_duplicate_rules fwf LABELS dbfwfilter REPL_BACKEND) #add_test_executable(fwf_duplicate_rules.cpp fwf_duplicate_rules fwf LABELS dbfwfilter REPL_BACKEND)
add_test_executable(fwf_prepared_stmt.cpp fwf_prepared_stmt fwf LABELS dbfwfilter REPL_BACKEND) add_test_executable(fwf_prepared_stmt.cpp fwf_prepared_stmt fwf LABELS dbfwfilter REPL_BACKEND)
add_test_executable(fwf_actions.cpp fwf_actions fwf_action LABELS dbfwfilter REPL_BACKEND) add_test_executable(fwf_actions.cpp fwf_actions fwf_action LABELS dbfwfilter REPL_BACKEND)
add_test_executable(fwf_logging.cpp fwf_logging fwf_logging LABELS dbfwfilter REPL_BACKEND) add_test_executable(fwf_logging.cpp fwf_logging fwf_logging LABELS dbfwfilter REPL_BACKEND)
@ -584,8 +584,12 @@ add_test_script(sql_queries_pers10 sql_queries sql_queries_pers10 LABELS maxscal
# Execute queries of different size, check data is the same when accessing via Maxscale and directly to backend, client ssl is ON # Execute queries of different size, check data is the same when accessing via Maxscale and directly to backend, client ssl is ON
add_test_script(ssl sql_queries ssl LABELS maxscale readwritesplit REPL_BACKEND) add_test_script(ssl sql_queries ssl LABELS maxscale readwritesplit REPL_BACKEND)
# Check load balancing, client ssl is ON # Check load balancing, client ssl is ON
add_test_script(ssl_load load_balancing ssl_load LABELS maxscale readwritesplit REPL_BACKEND)
# Disabled due to some strangeness in Connector-C 3.0 TLS connections which
# cause uneven distribution of connections.
#add_test_script(ssl_load load_balancing ssl_load LABELS maxscale readwritesplit REPL_BACKEND)
# Check load balancing, client ssl is ON, Galera backend # Check load balancing, client ssl is ON, Galera backend
add_test_script(ssl_load_galera load_balancing_galera ssl_load_galera LABELS maxscale readwritesplit GALERA_BACKEND) add_test_script(ssl_load_galera load_balancing_galera ssl_load_galera LABELS maxscale readwritesplit GALERA_BACKEND)

14
maxscale-system-test/script.cpp
View File

@ -96,18 +96,18 @@ int main(int argc, char *argv[])
FILE * f; FILE * f;
f = fopen("script_output_expected", "w"); f = fopen("script_output_expected", "w");
fprintf(f, "--event=master_down --initiator=[%s]:%d --nodelist=[%s]:%d,[%s]:%d,[%s]:%d\n", fprintf(f, "--event=master_down --initiator=%s:%d --nodelist=%s:%d,%s:%d,%s:%d\n",
Test->repl->IP_private[0], Test->repl->port[0], Test->repl->IP_private[0], Test->repl->port[0],
Test->repl->IP_private[1], Test->repl->port[1], Test->repl->IP_private[1], Test->repl->port[1],
Test->repl->IP_private[2], Test->repl->port[2], Test->repl->IP_private[2], Test->repl->port[2],
Test->repl->IP_private[3], Test->repl->port[3]); Test->repl->IP_private[3], Test->repl->port[3]);
fprintf(f, "--event=master_up --initiator=[%s]:%d --nodelist=[%s]:%d,[%s]:%d,[%s]:%d,[%s]:%d\n", fprintf(f, "--event=master_up --initiator=%s:%d --nodelist=%s:%d,%s:%d,%s:%d,%s:%d\n",
Test->repl->IP_private[0], Test->repl->port[0], Test->repl->IP_private[0], Test->repl->port[0],
Test->repl->IP_private[0], Test->repl->port[0], Test->repl->IP_private[0], Test->repl->port[0],
Test->repl->IP_private[1], Test->repl->port[1], Test->repl->IP_private[1], Test->repl->port[1],
Test->repl->IP_private[2], Test->repl->port[2], Test->repl->IP_private[2], Test->repl->port[2],
Test->repl->IP_private[3], Test->repl->port[3]); Test->repl->IP_private[3], Test->repl->port[3]);
fprintf(f, "--event=slave_up --initiator=[%s]:%d --nodelist=[%s]:%d,[%s]:%d,[%s]:%d,[%s]:%d\n", fprintf(f, "--event=slave_up --initiator=%s:%d --nodelist=%s:%d,%s:%d,%s:%d,%s:%d\n",
Test->repl->IP_private[1], Test->repl->port[1], Test->repl->IP_private[1], Test->repl->port[1],
Test->repl->IP_private[0], Test->repl->port[0], Test->repl->IP_private[0], Test->repl->port[0],
Test->repl->IP_private[1], Test->repl->port[1], Test->repl->IP_private[1], Test->repl->port[1],
@ -116,23 +116,23 @@ int main(int argc, char *argv[])
fclose(f); fclose(f);
f = fopen("script_output_expected_galera", "w"); f = fopen("script_output_expected_galera", "w");
fprintf(f, "--event=synced_down --initiator=[%s]:%d --nodelist=[%s]:%d,[%s]:%d,[%s]:%d\n", fprintf(f, "--event=synced_down --initiator=%s:%d --nodelist=%s:%d,%s:%d,%s:%d\n",
Test->galera->IP_private[0], Test->galera->port[0], Test->galera->IP_private[0], Test->galera->port[0],
Test->galera->IP_private[1], Test->galera->port[1], Test->galera->IP_private[1], Test->galera->port[1],
Test->galera->IP_private[2], Test->galera->port[2], Test->galera->IP_private[2], Test->galera->port[2],
Test->galera->IP_private[3], Test->galera->port[3]); Test->galera->IP_private[3], Test->galera->port[3]);
fprintf(f, "--event=synced_up --initiator=[%s]:%d --nodelist=[%s]:%d,[%s]:%d,[%s]:%d,[%s]:%d\n", fprintf(f, "--event=synced_up --initiator=%s:%d --nodelist=%s:%d,%s:%d,%s:%d,%s:%d\n",
Test->galera->IP_private[0], Test->galera->port[0], Test->galera->IP_private[0], Test->galera->port[0],
Test->galera->IP_private[0], Test->galera->port[0], Test->galera->IP_private[0], Test->galera->port[0],
Test->galera->IP_private[1], Test->galera->port[1], Test->galera->IP_private[1], Test->galera->port[1],
Test->galera->IP_private[2], Test->galera->port[2], Test->galera->IP_private[2], Test->galera->port[2],
Test->galera->IP_private[3], Test->galera->port[3]); Test->galera->IP_private[3], Test->galera->port[3]);
fprintf(f, "--event=synced_down --initiator=[%s]:%d --nodelist=[%s]:%d,[%s]:%d,[%s]:%d\n", fprintf(f, "--event=synced_down --initiator=%s:%d --nodelist=%s:%d,%s:%d,%s:%d\n",
Test->galera->IP_private[1], Test->galera->port[1], Test->galera->IP_private[1], Test->galera->port[1],
Test->galera->IP_private[0], Test->galera->port[0], Test->galera->IP_private[0], Test->galera->port[0],
Test->galera->IP_private[2], Test->galera->port[2], Test->galera->IP_private[2], Test->galera->port[2],
Test->galera->IP_private[3], Test->galera->port[3]); Test->galera->IP_private[3], Test->galera->port[3]);
fprintf(f, "--event=synced_up --initiator=[%s]:%d --nodelist=[%s]:%d,[%s]:%d,[%s]:%d,[%s]:%d\n", fprintf(f, "--event=synced_up --initiator=%s:%d --nodelist=%s:%d,%s:%d,%s:%d,%s:%d\n",
Test->galera->IP_private[1], Test->galera->port[1], Test->galera->IP_private[1], Test->galera->port[1],
Test->galera->IP_private[0], Test->galera->port[0], Test->galera->IP_private[0], Test->galera->port[0],
Test->galera->IP_private[1], Test->galera->port[1], Test->galera->IP_private[1], Test->galera->port[1],