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

Speed up session_limits test

Browse Source 
The test now waits for a shorter time. Also refactored the test to use
stack allocated objects.
This commit is contained in:
Markus Mäkelä
2017-06-06 12:45:20 +03:00
parent 8d5c6ca00f
commit de23297944
2 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxscale-system-test/cnf/maxscale.cnf.template.session_limits
View File

@ -11,7 +11,7 @@ user=maxskysql
passwd= skysql passwd= skysql
[RW Split Router] [RW Split Router]
connection_timeout=30 connection_timeout=10
type=service type=service
router= readwritesplit router= readwritesplit
servers=server1, server2, server3,server4 servers=server1, server2, server3,server4

61
maxscale-system-test/session_limits.cpp
View File

@ -14,49 +14,40 @@ router_options=max_sescmd_history=10
* - execute one more session commad, excpect failure * - execute one more session commad, excpect failure
*/ */
#include <iostream>
#include "testconnections.h" #include "testconnections.h"
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
TestConnections * Test = new TestConnections(argc, argv); TestConnections test(argc, argv);
Test->set_timeout(200); int first_sleep = 5;
int i; int second_sleep = 12;
char sql[256];
Test->tprintf("Open session and wait 20 seconds\n"); test.set_timeout(200);
Test->connect_maxscale();
sleep(20);
Test->tprintf("Execute query to check session\n");
Test->try_query(Test->conn_rwsplit, "SELECT 1");
Test->tprintf("Wait 35 seconds more and try quiry again expecting failure\n"); test.tprintf("Open session, wait %d seconds and execute a query", first_sleep);
sleep(35); test.connect_maxscale();
if (execute_query(Test->conn_rwsplit, "SELECT 1") == 0) sleep(first_sleep);
test.try_query(test.conn_rwsplit, "SELECT 1");
test.tprintf("Wait %d seconds and execute query, expecting failure", second_sleep);
sleep(second_sleep);
test.add_result(execute_query(test.conn_rwsplit, "SELECT 1") == 0,
"Session was not closed after %d seconds",
second_sleep);
test.close_maxscale_connections();
test.tprintf("Open session and execute 10 session commands");
test.connect_maxscale();
for (int i = 0; i < 10; i++)
{ {
Test->add_result(1, "Session was not closed after 40 seconds\n"); test.try_query(test.conn_rwsplit, "set @test=1");
} }
Test->close_maxscale_connections();
Test->tprintf("Open session and execute 10 session commands\n"); test.tprintf("Execute one more session command and expect message in error log");
fflush(stdout); execute_query(test.conn_rwsplit, "set @test=1");
Test->connect_maxscale(); sleep(1);
for (i = 0; i < 10; i++) test.check_log_err("Router session exceeded session command history limit", true);
{ test.close_maxscale_connections();
sprintf(sql, "set @test=%d", i);
Test->try_query(Test->conn_rwsplit, sql);
}
Test->tprintf("done!\n");
Test->tprintf("Execute one more session command and expect message in error log\n"); return test.global_result;
execute_query(Test->conn_rwsplit, "set @test=11");
sleep(5);
Test->check_log_err((char *) "Router session exceeded session command history limit", true);
Test->close_maxscale_connections();
int rval = Test->global_result;
delete Test;
return rval;
} }