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

Use new MaxScale object names in mxs1457_ignore_deleted

Browse Source 
The names of the monitors and services in tests that use MaxScale 2.2 need
to use the hyphen-transformed versions of the object names.
This commit is contained in:
Markus Mäkelä 2017-10-04 00:47:31 +03:00
parent 9f66278ac2
commit 7dfa1577fc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 * The monitor needs to be stopped before the slaves are stopped to prevent
* it from detecting the broken replication. * it from detecting the broken replication.
*/ */
test.ssh_maxscale(true, "maxadmin shutdown monitor \"MySQL Monitor\""); test.ssh_maxscale(true, "maxadmin shutdown monitor MySQL-Monitor");
// Stop slaves and drop the user on the master // Stop slaves and drop the user on the master
test.repl->stop_slaves(); test.repl->stop_slaves();
test.repl->connect(); test.repl->connect();
@ -33,7 +33,7 @@ int main(int argc, char *argv[])
test.add_result(mysql_errno(conn) == 0, "Connection with users from master should fail"); test.add_result(mysql_errno(conn) == 0, "Connection with users from master should fail");
mysql_close(conn); mysql_close(conn);
test.ssh_maxscale(true, "maxadmin remove server server1 \"RW Split Router\""); test.ssh_maxscale(true, "maxadmin remove server server1 RW-Split-Router");
conn = open_conn_db(test.rwsplit_port, test.maxscale_ip(), "test", "auth_test", "test", false); conn = open_conn_db(test.rwsplit_port, test.maxscale_ip(), "test", "auth_test", "test", false);
test.add_result(mysql_errno(conn), "Connection should be OK: %s", mysql_error(conn)); test.add_result(mysql_errno(conn), "Connection should be OK: %s", mysql_error(conn));
test.try_query(conn, "SELECT 1"); test.try_query(conn, "SELECT 1");