refactored tests (#147)
This commit is contained in:
@ -26,7 +26,7 @@ void check_status(TestConnections *Test, const char *server, const char *status)
|
||||
|
||||
sprintf(cmd, "show server %s", server);
|
||||
Test->set_timeout(120);
|
||||
Test->get_maxadmin_param(cmd, (char *) "Status:", maxadmin_result);
|
||||
Test->maxscales->get_maxadmin_param(0, cmd, (char *) "Status:", maxadmin_result);
|
||||
if (maxadmin_result == NULL)
|
||||
{
|
||||
Test->add_result(1, "maxadmin execution error\n");
|
||||
@ -42,7 +42,8 @@ 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");
|
||||
int exit_code;
|
||||
char *output = Test->maxscales->ssh_node_output(0, "maxadmin show monitor MySQL-Monitor", true, &exit_code);
|
||||
|
||||
if (output == NULL)
|
||||
{
|
||||
@ -83,21 +84,15 @@ void check_group(TestConnections *Test, const char *server, const char *group)
|
||||
|
||||
void change_master(TestConnections *Test, int slave, int master)
|
||||
{
|
||||
execute_query(Test->repl->nodes[slave], "CHANGE MASTER TO master_host='%s', master_port=3306, "
|
||||
execute_query(Test->repl->nodes[slave], "CHANGE MASTER TO master_host='%s', master_port=%d, "
|
||||
"master_log_file='mar-bin.000001', master_log_pos=4, master_user='repl', master_password='repl';START SLAVE",
|
||||
Test->repl->IP[master], Test->repl->user_name, Test->repl->password);
|
||||
Test->repl->IP[master], Test->repl->port[master]);
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
TestConnections * Test = new TestConnections(argc, argv);
|
||||
|
||||
Test->tprintf("Checking initial state of the servers");
|
||||
check_status(Test, "server1", "Master, Running");
|
||||
check_status(Test, "server2", "Slave, Running");
|
||||
check_status(Test, "server3", "Slave, Running");
|
||||
check_status(Test, "server4", "Slave, Running");
|
||||
|
||||
Test->tprintf("Test 1 - Configure all servers into a multi-master ring with one slave");
|
||||
|
||||
Test->set_timeout(120);
|
||||
|
Reference in New Issue
Block a user