UnitKitSyntheticLok can pass and finish earlier than UnitSyntheticLok…

… expects

It seems that UnitKitSyntheticLok regularly finishes successfully,
setting TestResult::Ok, before UnitSyntheticLok even gets to see that
the document is loaded.

UnitKitSyntheticLok flags UnitSyntheticLok that the test passed, so
presumably if we see that the test passed, then we are done don't
need to do anything else except exit.

Signed-off-by: Caolán McNamara <[email protected]>
Change-Id: I1111a195943789c5e31da814c8713e2b7b0070b3

test/UnitPerf.cpp

@@ -29,7 +29,6 @@
 #include <string>
 #include <thread>
 
-/// Save torture testcase.
 class UnitPerf : public UnitWSD
 {
     void testPerf(std::string testType, std::string fileType, std::string tracesStr);

test/UnitSyntheticLok.cpp

@@ -33,14 +33,16 @@ namespace {
     }
 }
 
-/// Save torture testcase.
+bool testCompletedSuccess = false;
+
 class UnitSyntheticLok : public UnitWSD
 {
     void loadAndSynthesize(const std::string& name, const std::string& docName);
 
 public:
     UnitSyntheticLok();
     void invokeWSDTest() override;
+    void endTest(const std::string& reason) override;
 };
 
 void UnitSyntheticLok::loadAndSynthesize(
@@ -57,7 +59,11 @@ void UnitSyntheticLok::loadAndSynthesize(
     poll->startThread();
 
     Poco::URI uri(helpers::getTestServerURI());
-    auto wsSession = helpers::loadDocAndGetSession(poll, docName, uri, testname);
+    auto wsSession = helpers::loadDocAndGetSession(poll, docName, uri, testname, true, false);
+
+    // If we have already exitTest successfully when this returns, then that's fine.
+    if (testCompletedSuccess)
+        return;
 
     std::vector<char> message
         = wsSession->waitForMessage("status:", timeout, name);
@@ -88,6 +94,12 @@ void UnitSyntheticLok::invokeWSDTest()
     // wait for result from the Kit process
 }
 
+void UnitSyntheticLok::endTest(const std::string& reason)
+{
+    UnitWSD::endTest(reason);
+    testCompletedSuccess = !failed();
+}
+
 class UnitKitSyntheticLok;
 
 UnitKitSyntheticLok *GlobalUnitKit;