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/nodes.cpp
+++ b/maxscale-system-test/nodes.cpp
@ -375,9 +375,9 @@ int Nodes::read_basic_env()

            sprintf(env_name, "%s_%03d_hostname", prefix, i);
            hostname[i] = strdup(get_nc_item(env_name).c_str());
-            if (hostname[i] == NULL)
+            if ((hostname[i] == NULL) || (strcmp(hostname[i], "") == 0))
            {
-                hostname[i] = IP[i];
+                hostname[i] = IP_private[i];
            }
            setenv(env_name, hostname[i], 1);