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

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

@ -96,18 +96,18 @@ int main(int argc, char *argv[])
FILE * f;
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[1], Test->repl->port[1],
Test->repl->IP_private[2], Test->repl->port[2],
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[1], Test->repl->port[1],
Test->repl->IP_private[2], Test->repl->port[2],
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[0], Test->repl->port[0],
Test->repl->IP_private[1], Test->repl->port[1],
@ -116,23 +116,23 @@ int main(int argc, char *argv[])
fclose(f);
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[1], Test->galera->port[1],
Test->galera->IP_private[2], Test->galera->port[2],
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[1], Test->galera->port[1],
Test->galera->IP_private[2], Test->galera->port[2],
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[0], Test->galera->port[0],
Test->galera->IP_private[2], Test->galera->port[2],
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[0], Test->galera->port[0],
Test->galera->IP_private[1], Test->galera->port[1],