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

Revert "Fix and disable 2.0 related tests"

Browse Source 
This partially reverts commit f2ba9dbed8510f7782c610c1eae1534db7ac9168.
This commit is contained in:
Markus Mäkelä
2017-06-02 14:05:12 +03:00
parent 2f6a5bcd07
commit 1e52191bdf
1 changed files with 7 additions and 7 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; 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],