refactored tests (#147)
This commit is contained in:
@ -27,22 +27,22 @@ int main(int argc, char *argv[])
|
||||
test.repl->sync_slaves();
|
||||
|
||||
test.tprintf("Run test with sharded database as active database");
|
||||
test.connect_rwsplit();
|
||||
test.try_query(test.conn_rwsplit, "USE db2");
|
||||
execute_query_check_one(test.conn_rwsplit, "SELECT @@server_id, id FROM t2", server_id[1]);
|
||||
execute_query_check_one(test.conn_rwsplit, "SELECT @@server_id, id FROM db1.t1", server_id[0]);
|
||||
execute_query_check_one(test.conn_rwsplit, "SELECT @@server_id, a.id FROM t2 as a JOIN db1.t1 as b",
|
||||
test.maxscales->connect_rwsplit(0);
|
||||
test.try_query(test.maxscales->conn_rwsplit[0], "USE db2");
|
||||
execute_query_check_one(test.maxscales->conn_rwsplit[0], "SELECT @@server_id, id FROM t2", server_id[1]);
|
||||
execute_query_check_one(test.maxscales->conn_rwsplit[0], "SELECT @@server_id, id FROM db1.t1", server_id[0]);
|
||||
execute_query_check_one(test.maxscales->conn_rwsplit[0], "SELECT @@server_id, a.id FROM t2 as a JOIN db1.t1 as b",
|
||||
server_id[1]);
|
||||
test.close_rwsplit();
|
||||
test.maxscales->close_rwsplit(0);
|
||||
|
||||
test.tprintf("Run test with a common database as active database");
|
||||
test.connect_rwsplit();
|
||||
test.try_query(test.conn_rwsplit, "USE db1");
|
||||
execute_query_check_one(test.conn_rwsplit, "SELECT @@server_id, id FROM t1", server_id[0]);
|
||||
execute_query_check_one(test.conn_rwsplit, "SELECT @@server_id, id FROM db2.t2", server_id[1]);
|
||||
execute_query_check_one(test.conn_rwsplit, "SELECT @@server_id, a.id FROM t1 as a JOIN db1.t1 as b",
|
||||
test.maxscales->connect_rwsplit(0);
|
||||
test.try_query(test.maxscales->conn_rwsplit[0], "USE db1");
|
||||
execute_query_check_one(test.maxscales->conn_rwsplit[0], "SELECT @@server_id, id FROM t1", server_id[0]);
|
||||
execute_query_check_one(test.maxscales->conn_rwsplit[0], "SELECT @@server_id, id FROM db2.t2", server_id[1]);
|
||||
execute_query_check_one(test.maxscales->conn_rwsplit[0], "SELECT @@server_id, a.id FROM t1 as a JOIN db1.t1 as b",
|
||||
server_id[0]);
|
||||
test.close_rwsplit();
|
||||
test.maxscales->close_rwsplit(0);
|
||||
|
||||
// Cleanup
|
||||
execute_query(test.repl->nodes[0], "DROP DATABASE db1");
|
||||
|
||||
Reference in New Issue
Block a user