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

Fix test configuration object names for 2.2

Browse Source 
The 2.2 object names are converted to hyphen separated forms to make them
REST API conforming.
This commit is contained in:
Markus Mäkelä
2017-06-17 08:58:31 +03:00
parent 5351c6c4a9
commit 80103c5a40
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxscale-system-test/fwf_reload.cpp
View File

@ -36,7 +36,7 @@ int main(int argc, char *argv[])
sprintf(str, "rules%d", i);
Test->set_timeout(180);
copy_rules(Test, str, rules_dir);
Test->ssh_maxscale(true, "maxadmin call command dbfwfilter rules/reload \"Database Firewall\"");
Test->ssh_maxscale(true, "maxadmin call command dbfwfilter rules/reload Database-Firewall");
int local_result = 0;
sprintf(pass_file, "%s/fw/pass%d", test_dir, i);

2
maxscale-system-test/mm_mysqlmon.cpp
View File

@ -42,7 +42,7 @@ void check_status(TestConnections *Test, const char *server, const char *status)
void check_group(TestConnections *Test, const char *server, const char *group)
{
char *output = Test->ssh_maxscale_output(true, "maxadmin show monitor \"MySQL Monitor\"");
char *output = Test->ssh_maxscale_output(true, "maxadmin show monitor MySQL-Monitor");
if (output == NULL)
{

2
maxscale-system-test/rw_select_insert.cpp
View File

@ -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);