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/mysqlmon_external_master.cpp
+++ b/maxscale-system-test/mysqlmon_external_master.cpp
@ -18,7 +18,7 @@ const StringSet down = {DOWN};
 void check_status(TestConnections& test, const char* server, const StringSet& expected, const char* message)
 {
    StringSet state = test.get_server_status(server);
-    test.assert(state == expected, "%s: %s", message, dump_status(state, expected).c_str());
+    test.expect(state == expected, "%s: %s", message, dump_status(state, expected).c_str());
 }

 static bool is_running = true;