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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Johan Wikman
2018-09-10 12:29:00 +03:00
parent 03017c6aad 6279ab350c
commit edd5ddcc88
63 changed files with 226 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxscale-system-test/mxs1831_unknown_param.cpp
View File

@ -13,11 +13,11 @@ int main(int argc, char** argv)
int rc = test.maxscales->ssh_node_f(0,
true,
"maxctrl alter monitor MySQL-Monitor not_a_parameter not_a_value|grep Error");
test.assert(rc == 0, "Altering unknown parameter should cause an error");
test.expect(rc == 0, "Altering unknown parameter should cause an error");
rc = test.maxscales->ssh_node_f(0,
true,
"maxctrl alter monitor MySQL-Monitor ignore_external_masters on_sunday_afternoons|grep Error");
test.assert(rc == 0, "Invalid parameter value should cause an error");
test.expect(rc == 0, "Invalid parameter value should cause an error");
return test.global_result;
}