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

@ -404,7 +404,7 @@ void TestConnections::add_result(bool result, const char* format, ...)
}
}
void TestConnections::assert(bool result, const char* format, ...)
void TestConnections::expect(bool result, const char* format, ...)
{
if (!result)
{
@ -847,7 +847,7 @@ int TestConnections::copy_maxscale_logs(double timestamp)
const char* command = "ls /tmp/core* && exit 42";
int rc = maxscales->ssh_node_f(i, true, "%s", command);
assert(rc != 42, "Test should not generate core files");
expect(rc != 42, "Test should not generate core files");
}
return 0;
}