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/mxs1808_long_data.cpp
+++ b/maxscale-system-test/mxs1808_long_data.cpp
@ -79,7 +79,7 @@ int main(int argc, char** argv)
    TestConnections test(argc, argv);

    test.maxscales->connect();
-    test.assert(test_long_data(test.maxscales->conn_rwsplit[0], 123456), "Test should work");
+    test.expect(test_long_data(test.maxscales->conn_rwsplit[0], 123456), "Test should work");
    test.maxscales->disconnect();

    return test.global_result;