refactored tests (#147)
This commit is contained in:
@ -18,7 +18,7 @@ void run_test(TestConnections* Test, const char* database)
|
||||
Test->set_timeout(20);
|
||||
Test->tprintf("Trying to connect using 'table_privilege'@'%%' to database '%s'", database);
|
||||
|
||||
MYSQL* conn = open_conn_db(Test->rwsplit_port, Test->maxscale_IP, database, "table_privilege", "pass",
|
||||
MYSQL* conn = open_conn_db(Test->maxscales->rwsplit_port[0], Test->maxscales->IP[0], database, "table_privilege", "pass",
|
||||
Test->ssl);
|
||||
|
||||
if (conn && mysql_errno(conn) == 0)
|
||||
@ -39,30 +39,30 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
TestConnections* Test = new TestConnections(argc, argv);
|
||||
|
||||
Test->connect_maxscale();
|
||||
Test->maxscales->connect_maxscale(0);
|
||||
Test->tprintf("Preparing test");
|
||||
Test->set_timeout(180);
|
||||
execute_query(Test->conn_rwsplit, "DROP DATABASE IF EXISTS db1");
|
||||
execute_query(Test->conn_rwsplit, "DROP DATABASE IF EXISTS db2");
|
||||
execute_query(Test->conn_rwsplit, "DROP DATABASE IF EXISTS db3");
|
||||
execute_query(Test->conn_rwsplit, "DROP DATABASE IF EXISTS db4");
|
||||
execute_query(Test->conn_rwsplit, "CREATE DATABASE db1");
|
||||
execute_query(Test->conn_rwsplit, "CREATE DATABASE db2");
|
||||
execute_query(Test->conn_rwsplit, "CREATE DATABASE db3");
|
||||
execute_query(Test->conn_rwsplit, "CREATE DATABASE db4");
|
||||
execute_query(Test->conn_rwsplit, "CREATE TABLE db1.t1 (id INT)");
|
||||
execute_query(Test->conn_rwsplit, "CREATE TABLE db2.t1 (id INT)");
|
||||
execute_query(Test->conn_rwsplit, "CREATE TABLE db3.t1 (id INT)");
|
||||
execute_query(Test->conn_rwsplit, "CREATE TABLE db4.t1 (id INT)");
|
||||
execute_query(Test->conn_rwsplit, "INSERT INTO db1.t1 VALUES (1)");
|
||||
execute_query(Test->conn_rwsplit, "INSERT INTO db2.t1 VALUES (1)");
|
||||
execute_query(Test->conn_rwsplit, "INSERT INTO db3.t1 VALUES (1)");
|
||||
execute_query(Test->conn_rwsplit, "INSERT INTO db4.t1 VALUES (1)");
|
||||
execute_query(Test->conn_rwsplit, "CREATE USER 'table_privilege'@'%%' IDENTIFIED BY 'pass'");
|
||||
execute_query(Test->conn_rwsplit, "GRANT SELECT ON db1.* TO 'table_privilege'@'%%'");
|
||||
execute_query(Test->conn_rwsplit, "GRANT SELECT ON db2.* TO 'table_privilege'@'%%'");
|
||||
execute_query(Test->conn_rwsplit, "GRANT SELECT ON db3.t1 TO 'table_privilege'@'%%'");
|
||||
execute_query(Test->conn_rwsplit, "GRANT SELECT ON db4.t1 TO 'table_privilege'@'%%'");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "DROP DATABASE IF EXISTS db1");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "DROP DATABASE IF EXISTS db2");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "DROP DATABASE IF EXISTS db3");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "DROP DATABASE IF EXISTS db4");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "CREATE DATABASE db1");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "CREATE DATABASE db2");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "CREATE DATABASE db3");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "CREATE DATABASE db4");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "CREATE TABLE db1.t1 (id INT)");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "CREATE TABLE db2.t1 (id INT)");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "CREATE TABLE db3.t1 (id INT)");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "CREATE TABLE db4.t1 (id INT)");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "INSERT INTO db1.t1 VALUES (1)");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "INSERT INTO db2.t1 VALUES (1)");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "INSERT INTO db3.t1 VALUES (1)");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "INSERT INTO db4.t1 VALUES (1)");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "CREATE USER 'table_privilege'@'%%' IDENTIFIED BY 'pass'");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "GRANT SELECT ON db1.* TO 'table_privilege'@'%%'");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "GRANT SELECT ON db2.* TO 'table_privilege'@'%%'");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "GRANT SELECT ON db3.t1 TO 'table_privilege'@'%%'");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "GRANT SELECT ON db4.t1 TO 'table_privilege'@'%%'");
|
||||
|
||||
Test->repl->sync_slaves();
|
||||
|
||||
@ -73,12 +73,12 @@ int main(int argc, char *argv[])
|
||||
|
||||
Test->tprintf("Cleaning up...");
|
||||
Test->set_timeout(60);
|
||||
Test->connect_maxscale();
|
||||
execute_query(Test->conn_rwsplit, "DROP DATABASE db1");
|
||||
execute_query(Test->conn_rwsplit, "DROP DATABASE db2");
|
||||
execute_query(Test->conn_rwsplit, "DROP DATABASE db3");
|
||||
execute_query(Test->conn_rwsplit, "DROP DATABASE db4");
|
||||
execute_query(Test->conn_rwsplit, "DROP USER 'table_privilege'@'%%'");
|
||||
Test->maxscales->connect_maxscale(0);
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "DROP DATABASE db1");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "DROP DATABASE db2");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "DROP DATABASE db3");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "DROP DATABASE db4");
|
||||
execute_query(Test->maxscales->conn_rwsplit[0], "DROP USER 'table_privilege'@'%%'");
|
||||
|
||||
int rval = Test->global_result;
|
||||
delete Test;
|
||||
|
Reference in New Issue
Block a user