diff --git a/maxscale-system-test/mxs1932_hidden_cnf.cpp b/maxscale-system-test/mxs1932_hidden_cnf.cpp index 4816cb369..922df5fac 100644 --- a/maxscale-system-test/mxs1932_hidden_cnf.cpp +++ b/maxscale-system-test/mxs1932_hidden_cnf.cpp @@ -16,6 +16,7 @@ int main(int argc, char** argv) TestConnections::skip_maxscale_start(true); TestConnections test(argc, argv); + // Create a file with a guaranteed bad configuration (turbochargers are not yet supported) ofstream cnf("hidden.cnf"); cnf << "[something]" << endl; cnf << "type=turbocharger" << endl; @@ -23,14 +24,18 @@ int main(int argc, char** argv) cnf << "speed=maximum" << endl; cnf.close(); + // Copy the configuration to MaxScale test.maxscales->copy_to_node_legacy("hidden.cnf", "~"); + + // Move it into the maxscale.cnf.d directory and make it a hidden file test.maxscales->ssh_node_f(0, true, "mkdir -p /etc/maxscale.cnf.d/;" "mv %s/hidden.cnf /etc/maxscale.cnf.d/.hidden.cnf;" "chown -R maxscale:maxscale /etc/maxscale.cnf.d/", test.maxscales->access_homedir[0]); - test.assert(test.maxscales->restart_maxscale() == 0, "Starting MaxScale should suceed"); + // Make sure the hidden configuration is not read and that MaxScale starts up + test.assert(test.maxscales->restart_maxscale() == 0, "Starting MaxScale should succeed"); test.maxscales->ssh_node_f(0, true, "rm -r /etc/maxscale.cnf.d/"); remove("hidden.cnf");