refactored tests (#147)
This commit is contained in:
@ -23,49 +23,50 @@ int main(int argc, char** argv)
|
||||
sprintf(master_id, "%d", test.repl->get_server_id(0));
|
||||
sprintf(slave_id, "%d", test.repl->get_server_id(1));
|
||||
|
||||
test.connect_maxscale();
|
||||
test.maxscales->connect_maxscale(0);
|
||||
test.tprintf("Configuration: strict_multi_stmt=true");
|
||||
|
||||
test.add_result(execute_query_check_one(test.conn_rwsplit,
|
||||
test.add_result(execute_query_check_one(test.maxscales->conn_rwsplit[0],
|
||||
"SELECT @@server_id",
|
||||
slave_id),
|
||||
"Query should be routed to slave");
|
||||
|
||||
test.add_result(execute_query_check_one(test.conn_rwsplit,
|
||||
test.add_result(execute_query_check_one(test.maxscales->conn_rwsplit[0],
|
||||
"USE test; SELECT @@server_id",
|
||||
master_id),
|
||||
"Query should be routed to master");
|
||||
|
||||
test.add_result(execute_query_check_one(test.conn_rwsplit,
|
||||
test.add_result(execute_query_check_one(test.maxscales->conn_rwsplit[0],
|
||||
"SELECT @@server_id",
|
||||
master_id),
|
||||
"All queries should be routed to master");
|
||||
|
||||
test.close_maxscale_connections();
|
||||
test.maxscales->close_maxscale_connections(0);
|
||||
|
||||
// Reconfigure MaxScale
|
||||
test.ssh_maxscale(true, "sed -i 's/strict_multi_stmt=true/strict_multi_stmt=false/' /etc/maxscale.cnf");
|
||||
test.restart_maxscale();
|
||||
test.maxscales->ssh_node(0, "sed -i 's/strict_multi_stmt=true/strict_multi_stmt=false/' /etc/maxscale.cnf",
|
||||
true);
|
||||
test.maxscales->restart_maxscale(0);
|
||||
|
||||
test.connect_maxscale();
|
||||
test.maxscales->connect_maxscale(0);
|
||||
test.tprintf("Configuration: strict_multi_stmt=false");
|
||||
|
||||
test.add_result(execute_query_check_one(test.conn_rwsplit,
|
||||
test.add_result(execute_query_check_one(test.maxscales->conn_rwsplit[0],
|
||||
"SELECT @@server_id",
|
||||
slave_id),
|
||||
"Query should be routed to slave");
|
||||
|
||||
test.add_result(execute_query_check_one(test.conn_rwsplit,
|
||||
test.add_result(execute_query_check_one(test.maxscales->conn_rwsplit[0],
|
||||
"USE test; SELECT @@server_id",
|
||||
master_id),
|
||||
"Query should be routed to master");
|
||||
|
||||
test.add_result(execute_query_check_one(test.conn_rwsplit,
|
||||
test.add_result(execute_query_check_one(test.maxscales->conn_rwsplit[0],
|
||||
"SELECT @@server_id",
|
||||
slave_id),
|
||||
"Query should be routed to slave");
|
||||
|
||||
test.close_maxscale_connections();
|
||||
test.maxscales->close_maxscale_connections(0);
|
||||
|
||||
return test.global_result;
|
||||
}
|
||||
|
Reference in New Issue
Block a user