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

Fix object names in test configurations

Browse Source 
Some of the test configurations relied on the name conversion that is now
removed.
This commit is contained in:
Markus Mäkelä
2019-03-27 08:21:20 +02:00
parent 3a8accee8f
commit 02bdc5ef4d
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maxscale-system-test/cnf/maxscale.cnf.template.mxs2295_change_user_loop
View File

@ -26,7 +26,7 @@ address=###node_server_IP_4###
port=###node_server_port_4###
protocol=MySQLBackend
[MySQL Monitor]
[MySQL-Monitor]
type=monitor
module=mysqlmon
servers=server1,server2,server3,server4
@ -34,7 +34,7 @@ user=maxskysql
password=skysql
monitor_interval=1000
[RW Split Router]
[RW-Split-Router]
type=service
router=readwritesplit
servers=server1,server2,server3,server4
@ -43,8 +43,8 @@ password=skysql
max_sescmd_history=20
disable_sescmd_history=false
[RW Split Listener]
[RW-Split-Listener]
type=listener
service=RW Split Router
service=RW-Split-Router
protocol=MySQLClient
port=4006

6
maxscale-system-test/cnf/maxscale.cnf.template.mxs2300_history_pruning
View File

@ -26,7 +26,7 @@ address=###node_server_IP_4###
port=###node_server_port_4###
protocol=MySQLBackend
[MySQL Monitor]
[MySQL-Monitor]
type=monitor
module=mysqlmon
servers=server1,server2,server3,server4
@ -34,7 +34,7 @@ user=maxskysql
password=skysql
monitor_interval=1000
[RW Split Router]
[RW-Split-Router]
type=service
router=readwritesplit
servers=server1,server2,server3,server4
@ -44,7 +44,7 @@ max_sescmd_history=10
prune_sescmd_history=true
max_slave_connections=1
[RW Split Listener]
[RW-Split-Listener]
type=listener
service=RW Split Router
protocol=MySQLClient

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

@ -21,7 +21,7 @@ int main(int argc, char* argv[])
* The monitor needs to be stopped before the slaves are stopped to prevent
* it from detecting the broken replication.
*/
test.maxscales->ssh_node(0, "maxadmin shutdown monitor \"MySQL Monitor\"", true);
test.maxscales->ssh_node(0, "maxadmin shutdown monitor MySQL-Monitor", true);
// Stop slaves and drop the user on the master
test.repl->stop_slaves();
test.repl->connect();
@ -38,7 +38,7 @@ int main(int argc, char* argv[])
test.add_result(mysql_errno(conn) == 0, "Connection with users from master should fail");
mysql_close(conn);
test.maxscales->ssh_node(0, "maxadmin remove server server1 \"RW-Split-Router\"", true);
test.maxscales->ssh_node(0, "maxadmin remove server server1 RW-Split-Router", true);
conn = open_conn_db(test.maxscales->rwsplit_port[0],
test.maxscales->ip(0),
"test",