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

[Jan Holesovsky]

 loolwsd/test/countloolkits.hpp |    2 +-
 loolwsd/test/httpwstest.cpp    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2b9295e8d7d03008c1a24e33bdd68c7f25ba980e
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Apr 29 22:00:45 2016 +0200

    countLoolKitProcesses() is more reliable here.

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 1880ab6..3840bb6 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -542,7 +542,7 @@ void HTTPWSTest::testReloadWhileDisconnecting()
         CPPUNIT_ASSERT_MESSAGE("cannot load the document " + documentURL, isDocumentLoaded(socket));
 
         // Should have no new instances.
-        CPPUNIT_ASSERT_EQUAL(kitcount, getLoolKitProcessCount());
+        CPPUNIT_ASSERT_EQUAL(kitcount, countLoolKitProcesses(kitcount));
 
         // Check if the document contains the pasted text.
         sendTextFrame(socket, "uno .uno:SelectAll");
commit ce691601dd1fa48f9b15b18822426c33b0cbcbd2
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Apr 29 21:54:42 2016 +0200

    Need a longer default timeout for the httpwstest.cpp.

diff --git a/loolwsd/test/countloolkits.hpp b/loolwsd/test/countloolkits.hpp
index 2490f22..c81bf98 100644
--- a/loolwsd/test/countloolkits.hpp
+++ b/loolwsd/test/countloolkits.hpp
@@ -66,7 +66,7 @@ int getLoolKitProcessCount()
 }
 
 static
-int countLoolKitProcesses(const int expected, const int timeoutMs = POLL_TIMEOUT_MS * 5)
+int countLoolKitProcesses(const int expected, const int timeoutMs = POLL_TIMEOUT_MS * 10)
 {
     const size_t repeat = (timeoutMs + POLL_TIMEOUT_MS - 1) / POLL_TIMEOUT_MS;
     auto count = getLoolKitProcessCount();