wsd: test: do not advance to next test on failure

Change-Id: I2831c90e088064f5a254ef8a9809796e8320ed04
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>

1 files changed, 5 insertions, 4 deletions

diff --git a/common/Unit.cpp b/common/Unit.cpp
index 8f2f18f500..42d6edfaf1 100644
--- a/common/Unit.cpp
+++ b/common/Unit.cpp
@@ -612,7 +612,8 @@ void UnitWSD::DocBrokerDestroy(const std::string& key)
             GlobalWSD = nullptr;
             GlobalTool = nullptr;
 
-            if (GlobalArray[GlobalIndex] != nullptr)
+            if (GlobalArray[GlobalIndex] != nullptr && !SigUtil::getShutdownRequestFlag() &&
+                (_result == TestResult::Ok || GlobalTestOptions.getKeepgoing()))
             {
                 rememberInstance(_type, GlobalArray[GlobalIndex]);
 
@@ -621,10 +622,10 @@ void UnitWSD::DocBrokerDestroy(const std::string& key)
                 if (GlobalWSD)
                     GlobalWSD->configure(Poco::Util::Application::instance().config());
                 GlobalArray[GlobalIndex]->initialize();
-
-                // Wake-up so the previous test stops.
-                SocketPoll::wakeupWorld();
             }
+
+            // Wake-up so the previous test stops.
+            SocketPoll::wakeupWorld();
         }
     }
 }