[Libreoffice-commits] online.git: loolwsd/test

[Ashod Nakashian]

 loolwsd/test/httpcrashtest.cpp |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit b5dd13c57f748cc07611ba1e4d859fcf376c88a7
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon Nov 14 08:05:12 2016 -0500

    loolwsd: wait for kit processes only when killing them
    
    Change-Id: I89ec8c728b53ff1acdf9e8d12137ffc7c13f6ba5
    Reviewed-on: https://gerrit.libreoffice.org/30845
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/test/httpcrashtest.cpp b/loolwsd/test/httpcrashtest.cpp
index fea8734..1bfd4f2 100644
--- a/loolwsd/test/httpcrashtest.cpp
+++ b/loolwsd/test/httpcrashtest.cpp
@@ -125,6 +125,7 @@ void HTTPCrashTest::testBarren()
     try
     {
         killLoKitProcesses("(loolkit)");
+        countLoolKitProcesses(0);
 
         std::cerr << "Loading after kill." << std::endl;
 
@@ -148,6 +149,7 @@ void HTTPCrashTest::testCrashKit()
         auto socket = loadDocAndGetSocket("empty.odt", _uri, testname);
 
         killLoKitProcesses("(loolkit)");
+        countLoolKitProcesses(0);
 
         // We expect the client connection to close.
         // In the future we might restore the kit, but currently we don't.
@@ -202,8 +204,9 @@ void HTTPCrashTest::testCrashForkit()
         socket->shutdown();
 
 
-        std::cerr << "Killing forkit." << std::endl;
+        std::cerr << "Killing loolkit." << std::endl;
         killLoKitProcesses("(loolkit)");
+        countLoolKitProcesses(0);
         std::cerr << "Communicating after kill." << std::endl;
         loadDocAndGetSocket("empty.odt", _uri, testname);
     }
@@ -253,8 +256,6 @@ void HTTPCrashTest::killLoKitProcesses(const char* exec_filename)
         {
         }
     }
-
-    countLoolKitProcesses(0);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(HTTPCrashTest);