hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactored tests (#147)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

30
maxscale-system-test/bug718.cpp
View File

@ -27,18 +27,18 @@ int main(int argc, char *argv[])
Test->set_timeout(20);
int i;
Test->execute_maxadmin_command((char *) "set server server1 master");
Test->execute_maxadmin_command((char *) "set server server2 slave");
Test->execute_maxadmin_command((char *) "set server server3 slave");
Test->execute_maxadmin_command((char *) "set server server4 slave");
Test->maxscales->execute_maxadmin_command(0, (char *) "set server server1 master");
Test->maxscales->execute_maxadmin_command(0, (char *) "set server server2 slave");
Test->maxscales->execute_maxadmin_command(0, (char *) "set server server3 slave");
Test->maxscales->execute_maxadmin_command(0, (char *) "set server server4 slave");
Test->execute_maxadmin_command((char *) "set server g_server1 master");
Test->execute_maxadmin_command((char *) "set server g_server2 slave");
Test->execute_maxadmin_command((char *) "set server g_server3 slave");
Test->execute_maxadmin_command((char *) "set server g_server4 slave");
Test->maxscales->execute_maxadmin_command(0, (char *) "set server g_server1 master");
Test->maxscales->execute_maxadmin_command(0, (char *) "set server g_server2 slave");
Test->maxscales->execute_maxadmin_command(0, (char *) "set server g_server3 slave");
Test->maxscales->execute_maxadmin_command(0, (char *) "set server g_server4 slave");
Test->tprintf("Connecting to all MaxScale services\n");
Test->add_result(Test->connect_maxscale(), "Error connection to Maxscale\n");
Test->add_result(Test->maxscales->connect_maxscale(0), "Error connection to Maxscale\n");
//MYSQL * galera_rwsplit = open_conn(4016, Test->Maxscale_IP, Test->Maxscale_User, Test->Maxscale_Password);
@ -53,11 +53,11 @@ int main(int argc, char *argv[])
iret1[i] = pthread_create(&thread_v1[i], NULL, thread1, NULL);
}
create_t1(Test->conn_rwsplit);
create_t1(Test->maxscales->conn_rwsplit[0]);
for (i = 0; i < iterations; i++)
{
Test->set_timeout(200);
insert_into_t1(Test->conn_rwsplit, 4);
insert_into_t1(Test->maxscales->conn_rwsplit[0], 4);
printf("i=%d\n", i);
}
Test->set_timeout(300);
@ -66,8 +66,8 @@ int main(int argc, char *argv[])
pthread_join(thread_v1[i], NULL);
}
Test->close_maxscale_connections();
Test->check_maxscale_alive();
Test->maxscales->close_maxscale_connections(0);
Test->check_maxscale_alive(0);
int rval = Test->global_result;
delete Test;
@ -76,9 +76,9 @@ int main(int argc, char *argv[])
void *thread1( void *ptr )
{
MYSQL * conn = open_conn(Test->rwsplit_port , Test->maxscale_IP, Test->maxscale_user, Test->maxscale_password,
MYSQL * conn = open_conn(Test->maxscales->rwsplit_port[0] , Test->maxscales->IP[0], Test->maxscales->user_name, Test->maxscales->password,
Test->ssl);
MYSQL * g_conn = open_conn(4016 , Test->maxscale_IP, Test->maxscale_user, Test->maxscale_password, Test->ssl);
MYSQL * g_conn = open_conn(4016 , Test->maxscales->IP[0], Test->maxscales->user_name, Test->maxscales->password, Test->ssl);
char sql[1034];
sprintf(sql, "CREATE DATABASE IF NOT EXISTS test%d;", db1_num);