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

Fix 2.0 tests

Browse Source 
Altered some of the tests to look for less specific log entries. Removed
new options from galera configurations. Reduced log output of some tests.
This commit is contained in:
Markus Mäkelä 2017-05-27 11:52:25 +03:00
parent 42c85eb110
commit 819a0296ab
16 changed files with 34 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
maxscale-system-test/bug547.cpp
View File

@ -43,12 +43,12 @@ int main(int argc, char *argv[])
Test->set_timeout(30);
Test->tprintf("Trying some queries, expecting failure, but not a crash\n");
execute_query(Test->conn_rwsplit, (char *) "DROP TABLE IF EXISTS t1");
execute_query(Test->conn_rwsplit, (char *) "CREATE TABLE t1 (x INT)");
execute_query(Test->conn_rwsplit, (char *) "INSERT INTO t1 (x) VALUES (1)");
execute_query(Test->conn_rwsplit, (char *) "select * from t1");
execute_query(Test->conn_master, (char *) "select * from t1");
execute_query(Test->conn_slave, (char *) "select * from t1");
execute_query(Test->conn_rwsplit, "DROP TABLE IF EXISTS t1");
execute_query(Test->conn_rwsplit, "CREATE TABLE t1 (x INT)");
execute_query(Test->conn_rwsplit, "INSERT INTO t1 (x) VALUES (1)");
execute_query(Test->conn_rwsplit, "select * from t1");
execute_query(Test->conn_master, "select * from t1");
execute_query(Test->conn_slave, "select * from t1");
Test->set_timeout(10);
Test->close_maxscale_connections();
@ -58,12 +58,8 @@ int main(int argc, char *argv[])
Test->stop_timeout();
sleep(15);
Test->check_log_err((char *) "fatal signal 11", false);
Test->check_log_err((char *) "Failed to create new router session for service 'RW-Split-Router'", true);
Test->check_log_err((char *)
"Failed to create new router session for service 'Read-Connection-Router-Master'", true);
Test->check_log_err((char *) "Failed to create new router session for service 'Read-Connection-Router-Slave'",
true);
Test->check_log_err("fatal signal 11", false);
Test->check_log_err("Failed to create new router session for service", true);
int rval = Test->global_result;
delete Test;

12
maxscale-system-test/bug643.cpp
View File

@ -22,16 +22,6 @@ service=RW Split Router
* - check warnig in the log "RW Split Router: Recursive use of tee filter in service"
*/
/*
Mark Riddoch 2014-12-11 11:59:19 UTC
There is a recursive use of the tee filter in the configuration.
The "RW Split Router" uses the"duplicate" filter that will then duplicate all traffic to the original destination and another copy of the "RW Split Router", which again will duplicate all traffic to the original destination and another copy of the "RW Split Router"...
Really this needs to be trapped as a configuration error.
*/
#include <iostream>
#include "testconnections.h"
@ -56,7 +46,7 @@ int main(int argc, char *argv[])
Test->add_result(1, "FAIL: Query to broken service succeeded!\n");
}
Test->close_maxscale_connections();
Test->check_log_err((char *) "RW-Split-Router: Recursive use of tee filter in service", true);
Test->check_log_err("Recursive use of tee filter in service", true);
int rval = Test->global_result;
delete Test;

3
maxscale-system-test/bug681.cpp
View File

@ -44,8 +44,7 @@ int main(int argc, char *argv[])
Test->close_maxscale_connections();
Test->check_log_err((char *)
"Unable to start RW-Split-Router service. There are too few backend servers configured in", true);
Test->check_log_err("There are too few backend servers configured in", true);
int rval = Test->global_result;
delete Test;

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

@ -18,7 +18,7 @@ servers=gserver1,gserver2,gserver3,gserver4
user=maxskysql
passwd=skysql
monitor_interval=1000
root_node_as_master=false
#root_node_as_master=false
[RW Split Router]
type=service

3
maxscale-system-test/cnf/maxscale.cnf.template.galera
View File

@ -1,6 +1,5 @@
[maxscale]
threads=###threads###
log_warning=1
[Galera Monitor]
type=monitor
@ -9,7 +8,7 @@ servers=server1,server2,server3,server4
user=maxskysql
passwd=skysql
monitor_interval=1000
root_node_as_master=false
#root_node_as_master=false
[RW Split Router]
type=service

2
maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681
View File

@ -10,7 +10,7 @@ servers=server1,server2,server3
#passwd=maxpwd
user=maxskysql
passwd=skysql
root_node_as_master=false
#root_node_as_master=false
[RW Split Router]
type=service

12
maxscale-system-test/cnf/maxscale.cnf.template.galera.weight
View File

@ -9,7 +9,7 @@ servers=server1,server2,server3,server4
user=maxskysql
passwd=skysql
use_priority=true
root_node_as_master=false
#root_node_as_master=false
[RW Split Router]
type=service
@ -44,6 +44,16 @@ protocol=MySQLClient
port=4008
#socket=/tmp/readconn.sock
[CLI]
type=service
router=cli
[CLI Listener]
type=listener
service=CLI
protocol=maxscaled
socket=default
[server1]
type=server
address=###galera_server_IP_1###

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

@ -8,7 +8,7 @@ module=galeramon
servers=server1,server2,server3,server4
user=maxskysql
passwd=skysql
root_node_as_master=false
#root_node_as_master=false
[RW Split Router]
type=service

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

@ -12,7 +12,7 @@ user=maxskysql
passwd=skysql
use_priority=true
monitor_interval=1000
root_node_as_master=false
#root_node_as_master=false
[RW Split Router]
type=service

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

@ -8,7 +8,7 @@ module=galeramon
servers=server1,server2,server3,server4
user=maxskysql
passwd=skysql
root_node_as_master=false
#root_node_as_master=false
[RW Split Router]
type=service

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

@ -8,7 +8,7 @@ module=galeramon
servers=server1,server2,server3,server4
user=maxskysql
passwd=skysql
root_node_as_master=false
#root_node_as_master=false
[RW Split Router]
type=service

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

@ -8,7 +8,7 @@ module=galeramon
servers=server1,server2,server3,server4
user=maxskysql
passwd=skysql
root_node_as_master=false
#root_node_as_master=false
[RW Split Router]
type=service

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

@ -20,7 +20,7 @@ servers=gserver1,gserver2,gserver3,gserver4
script=/###access_homedir###/script/script.sh --event=$EVENT --initiator=$INITIATOR --nodelist=$NODELIST
events=master_down,master_up, slave_up, server_down ,server_up,lost_master,lost_slave,new_master,new_slave,server_down,server_up,synced_down,synced_up
disable_master_role_setting=true
root_node_as_master=false
#root_node_as_master=false
user=maxskysql
passwd=skysql
monitor_interval=1000

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

@ -8,7 +8,7 @@ module=galeramon
servers=server1,server2,server3,server4
user=maxskysql
passwd=skysql
root_node_as_master=false
#root_node_as_master=false
[RW Split Router]
type=service

4
maxscale-system-test/config_test.cpp
View File

@ -15,8 +15,8 @@ const char *bad_configs[] =
"bug479",
"bug493",
"bad_ssl",
"mxs710_bad_socket",
"mxs711_two_ports",
//"mxs710_bad_socket",
//"mxs711_two_ports",
"mxs720_line_with_no_equal",
"mxs720_wierd_line",
"mxs799",

2
maxscale-system-test/ses_bigmem.cpp
View File

@ -30,7 +30,7 @@ int main(int argc, char *argv[])
Test->try_query(Test->routers[j], (char*) "select 1;");
Test->try_query(Test->routers[j], (char*) "set autocommit=1;");
Test->try_query(Test->routers[j], (char*) "select 2;");
if ((i / 100) * 100 == i)
if ((i / 1000) * 1000 == i)
{
Test->tprintf("i=%d\n", i);
}