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

6
maxscale-system-test/mxs1961_standalone_rejoin.cpp
View File

@ -45,17 +45,17 @@ int main(int argc, char* argv[])
auto slave = [&](const char* name) {
static StringSet slave {"Slave", "Running"};
test.assert(status(name) == slave, "'%s' should be a slave", name);
test.expect(status(name) == slave, "'%s' should be a slave", name);
};
auto master = [&](const char* name) {
static StringSet master {"Master", "Running"};
test.assert(status(name) == master, "'%s' should be the master", name);
test.expect(status(name) == master, "'%s' should be the master", name);
};
auto down = [&](const char* name) {
static StringSet down {"Down"};
test.assert(status(name) == down, "'%s' should be down", name);
test.expect(status(name) == down, "'%s' should be down", name);
};
auto block = [&](int node) {