Merge test changes from 2.3

2019-12-16 20:01:35 +02:00
parent e3402c42cc aa801c74c5
commit a2eafc2381
31 changed files with 88 additions and 90 deletions
--- a/maxscale-system-test/mysqlmon_rejoin_manual.cpp
+++ b/maxscale-system-test/mysqlmon_rejoin_manual.cpp
@ -123,8 +123,8 @@ int main(int argc, char** argv)
            test.repl->connect();
            if (find_field(conn, sstatus_query.c_str(), "Master_Host", result) == 0)
            {
-                test.expect(strcmp(result, test.repl->IP[0]) == 0,
-                        "server3 did not rejoin the cluster (%s != %s).", result, test.repl->IP[0]);
+                test.expect(strcmp(result, test.repl->IP_private[0]) == 0,
+                        "server3 did not rejoin the cluster (%s != %s).", result, test.repl->IP_private[0]);
            }
            else
            {