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/local_address.cpp
View File

@ -253,11 +253,11 @@ void test_connecting(TestConnections& test,
if (!could_connect && should_be_able_to)
{
test.assert(false, "%s@%s should have been able to connect, but wasn't.", zUser, zHost);
test.expect(false, "%s@%s should have been able to connect, but wasn't.", zUser, zHost);
}
else if (could_connect && !should_be_able_to)
{
test.assert(false, "%s@%s should NOT have been able to connect, but was.", zUser, zHost);
test.expect(false, "%s@%s should NOT have been able to connect, but was.", zUser, zHost);
}
else
{
@ -361,7 +361,7 @@ int main(int argc, char** argv)
}
else
{
test.assert(false, "MaxScale node does not have at least one IP-address.");
test.expect(false, "MaxScale node does not have at least one IP-address.");
}
return test.global_result;