refactored tests (#147)

This commit is contained in:
Timofey Turenko
2017-12-08 12:23:04 +02:00
committed by GitHub
parent c6daf8c26b
commit 3c88bf1ec6
253 changed files with 5265 additions and 3649 deletions

View File

@ -68,7 +68,7 @@ int main(int argc, char *argv[])
Test->set_timeout(60);
Test->repl->connect();
Test->connect_maxscale();
Test->maxscales->connect_maxscale(0);
if (Test->repl->N < 3)
{
@ -79,12 +79,12 @@ int main(int argc, char *argv[])
Test->tprintf("Creating table\n");
fflush(stdout);
Test->try_query(Test->conn_rwsplit, (char *) "DROP TABLE IF EXISTS t2");
Test->try_query(Test->conn_rwsplit,
Test->try_query(Test->maxscales->conn_rwsplit[0], (char *) "DROP TABLE IF EXISTS t2");
Test->try_query(Test->maxscales->conn_rwsplit[0],
(char *) "CREATE TABLE t2 (id INT(10) NOT NULL AUTO_INCREMENT, x int, PRIMARY KEY (id));");
Test->tprintf("Doing INSERTs\n");
fflush(stdout);
Test->try_query(Test->conn_rwsplit, (char *) "insert into t2 (x) values (1);");
Test->try_query(Test->maxscales->conn_rwsplit[0], (char *) "insert into t2 (x) values (1);");
Test->stop_timeout();
Test->repl->sync_slaves();
@ -95,7 +95,7 @@ int main(int argc, char *argv[])
char last_insert_id2[1024];
if ( (
find_field(
Test->conn_rwsplit, sel1,
Test->maxscales->conn_rwsplit[0], sel1,
"@@server_id", &last_insert_id1[0])
!= 0 ) || (
find_field(
@ -115,10 +115,10 @@ int main(int argc, char *argv[])
"last_insert_id() are different depending in which order terms are in SELECT\n");
}
Test->close_maxscale_connections();
Test->maxscales->close_maxscale_connections(0);
Test->repl->close_connections();
Test->check_maxscale_alive();
Test->check_maxscale_alive(0);
int rval = Test->global_result;
delete Test;