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

MXS-1932: Make it clear what is being tested

Browse Source 
The test was not very clear about what it does. Added comments to clarify
what is done and why. Also fixed a typo.
This commit is contained in:
Markus Mäkelä
2018-06-21 15:16:13 +03:00
parent d22a62c0ff
commit c49b6ada7d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
maxscale-system-test/mxs1932_hidden_cnf.cpp
View File

@ -16,6 +16,7 @@ int main(int argc, char** argv)
TestConnections::skip_maxscale_start(true); TestConnections::skip_maxscale_start(true);
TestConnections test(argc, argv); TestConnections test(argc, argv);
// Create a file with a guaranteed bad configuration (turbochargers are not yet supported)
ofstream cnf("hidden.cnf"); ofstream cnf("hidden.cnf");
cnf << "[something]" << endl; cnf << "[something]" << endl;
cnf << "type=turbocharger" << endl; cnf << "type=turbocharger" << endl;
@ -23,14 +24,18 @@ int main(int argc, char** argv)
cnf << "speed=maximum" << endl; cnf << "speed=maximum" << endl;
cnf.close(); cnf.close();
// Copy the configuration to MaxScale
test.maxscales->copy_to_node_legacy("hidden.cnf", "~"); 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, test.maxscales->ssh_node_f(0, true,
"mkdir -p /etc/maxscale.cnf.d/;" "mkdir -p /etc/maxscale.cnf.d/;"
"mv %s/hidden.cnf /etc/maxscale.cnf.d/.hidden.cnf;" "mv %s/hidden.cnf /etc/maxscale.cnf.d/.hidden.cnf;"
"chown -R maxscale:maxscale /etc/maxscale.cnf.d/", "chown -R maxscale:maxscale /etc/maxscale.cnf.d/",
test.maxscales->access_homedir[0]); 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/"); test.maxscales->ssh_node_f(0, true, "rm -r /etc/maxscale.cnf.d/");
remove("hidden.cnf"); remove("hidden.cnf");