From d98ffb5d0a3a7889b45f49f094903a20f378c823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Tue, 3 Jul 2018 18:41:02 +0300 Subject: [PATCH] Always stop MaxScale before test The test should stop MaxScale at the start unless the manual debug flag is given on the command line. This fixes the connection failure of mxs1719 but reveals a problem with the filter itself. --- maxscale-system-test/testconnections.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/maxscale-system-test/testconnections.cpp b/maxscale-system-test/testconnections.cpp index c5c4ea280..7515b8232 100644 --- a/maxscale-system-test/testconnections.cpp +++ b/maxscale-system-test/testconnections.cpp @@ -18,6 +18,7 @@ namespace maxscale { static bool start = true; static bool check_nodes = true; +static bool manual_debug = false; static std::string required_repl_version; static std::string required_galera_version; } @@ -157,6 +158,7 @@ TestConnections::TestConnections(int argc, char *argv[]): case 's': printf("Maxscale won't be started\n"); maxscale::start = false; + maxscale::manual_debug = true; break; case 'i': @@ -641,7 +643,7 @@ void TestConnections::init_maxscale(int m) { const char * template_name = get_template_name(test_name); - if (maxscale::start) + if (!maxscale::manual_debug) { stop_maxscale(m); }