refactored tests (#147)
This commit is contained in:
@ -21,54 +21,54 @@ int main(int argc, char** argv)
|
||||
test->stop_timeout();
|
||||
|
||||
test->tprintf("Creating rules\n");
|
||||
test->stop_maxscale();
|
||||
test->maxscales->stop_maxscale(0);
|
||||
|
||||
sprintf(rules_dir, "%s/fw/", test_dir);
|
||||
copy_rules(test, (char*) "rules_actions", rules_dir);
|
||||
|
||||
test->set_timeout(60);
|
||||
test->start_maxscale();
|
||||
test->maxscales->start_maxscale(0);
|
||||
|
||||
test->set_timeout(30);
|
||||
test->connect_maxscale();
|
||||
test->maxscales->connect_maxscale(0);
|
||||
|
||||
/** Test blacklisting functionality */
|
||||
test->tprintf("Trying matching query to blacklisted RWSplit, expecting failure\n");
|
||||
test->set_timeout(30);
|
||||
test->add_result(!execute_query_silent(test->conn_rwsplit, "select 1"),
|
||||
test->add_result(!execute_query_silent(test->maxscales->conn_rwsplit[0], "select 1"),
|
||||
"Matching query to blacklist service should fail.\n");
|
||||
test->tprintf("Trying non-matching query to blacklisted RWSplit, expecting success\n");
|
||||
test->set_timeout(30);
|
||||
test->add_result(execute_query_silent(test->conn_rwsplit, "show status"),
|
||||
test->add_result(execute_query_silent(test->maxscales->conn_rwsplit[0], "show status"),
|
||||
"Non-matching query to blacklist service should succeed.\n");
|
||||
|
||||
/** Test whitelisting functionality */
|
||||
test->tprintf("Trying matching query to whitelisted Conn slave, expecting success\n");
|
||||
test->set_timeout(30);
|
||||
test->add_result(execute_query_silent(test->conn_slave, "select 1"),
|
||||
test->add_result(execute_query_silent(test->maxscales->conn_slave[0], "select 1"),
|
||||
"Query to whitelist service should succeed.\n");
|
||||
test->tprintf("Trying non-matching query to whitelisted Conn slave, expecting failure\n");
|
||||
test->set_timeout(30);
|
||||
test->add_result(!execute_query_silent(test->conn_slave, "show status"),
|
||||
test->add_result(!execute_query_silent(test->maxscales->conn_slave[0], "show status"),
|
||||
"Non-matching query to blacklist service should fail.\n");
|
||||
|
||||
/** Testing NO OP mode */
|
||||
test->tprintf("Trying matching query to ignoring Conn master, expecting success\n");
|
||||
test->set_timeout(30);
|
||||
test->add_result(execute_query_silent(test->conn_master, "select 1"),
|
||||
test->add_result(execute_query_silent(test->maxscales->conn_master[0], "select 1"),
|
||||
"Query to ignoring service should succeed.\n");
|
||||
test->tprintf("Trying non-matching query to ignoring Conn master, expecting success\n");
|
||||
test->set_timeout(30);
|
||||
test->add_result(execute_query_silent(test->conn_master, "show status"),
|
||||
test->add_result(execute_query_silent(test->maxscales->conn_master[0], "show status"),
|
||||
"Non-matching query to ignoring service should succeed.\n");
|
||||
|
||||
test->stop_timeout();
|
||||
test->tprintf("Checking if MaxScale is alive\n");
|
||||
test->check_maxscale_processes(1);
|
||||
test->stop_maxscale();
|
||||
test->check_maxscale_processes(0, 1);
|
||||
test->maxscales->stop_maxscale(0);
|
||||
sleep(10);
|
||||
test->tprintf("Checking if MaxScale was succesfully terminated\n");
|
||||
test->check_maxscale_processes(0);
|
||||
test->check_maxscale_processes(0, 0);
|
||||
int rval = test->global_result;
|
||||
delete test;
|
||||
return rval;
|
||||
|
||||
Reference in New Issue
Block a user