Merge branch '2.2' into develop

2018-09-10 12:29:00 +03:00
parent 03017c6aad 6279ab350c
commit edd5ddcc88
63 changed files with 226 additions and 226 deletions
--- a/maxscale-system-test/bug547.cpp
+++ b/maxscale-system-test/bug547.cpp
@ -35,7 +35,7 @@ int main(int argc, char* argv[])

    test.set_timeout(30);
    test.tprintf("Connecting to all MaxScale services, expecting no errors");
-    test.assert(test.maxscales->connect_maxscale(0) == 0, "Connection should not fail");
+    test.expect(test.maxscales->connect_maxscale(0) == 0, "Connection should not fail");

    test.set_timeout(30);
    test.tprintf("Trying some queries, expecting no failures");