From 00eb7cb4eeecbcdcfd4c6f17ad82a71e1ad543d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Fri, 9 Nov 2018 10:10:48 +0200
Subject: [PATCH] Automatically stop secondary MaxScale

If the test uses two MaxScales, they are automatically stopped after the
test. This prevents the second MaxScale from interfering with subsequent
tests.
---
 maxscale-system-test/testconnections.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maxscale-system-test/testconnections.cpp b/maxscale-system-test/testconnections.cpp
index 8611658a4..510f7456c 100644
--- a/maxscale-system-test/testconnections.cpp
+++ b/maxscale-system-test/testconnections.cpp
@@ -395,6 +395,11 @@ TestConnections::~TestConnections()
         delete galera;
     }
 
+    if (maxscale::multiple_maxscales)
+    {
+        maxscales->stop_all();
+    }
+
     if (global_result)
     {
         // This causes the test to fail if a core dump is found