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/masking_auto_firewall.cpp
+++ b/maxscale-system-test/masking_auto_firewall.cpp
@ -173,7 +173,7 @@ int main(int argc, char* argv[])

    std::string json_file("/masking_auto_firewall.json");
    std::string from = test_dir + json_file;
-    std::string to = "/home/vagrant" + json_file;
+    std::string to = std::string(test.maxscales->access_homedir[0]) + json_file;

    if (test.maxscales->copy_to_node(0, from.c_str(), to.c_str()) == 0)
    {