[Libreoffice-commits] online.git: test/countloolkits.hpp

Miklos Vajna (via logerrit) logerrit at kemper.freedesktop.org
Thu Jul 23 08:49:55 UTC 2020


 test/countloolkits.hpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ecfca6d1f048f0a5cf86ea90e7773558d0ee34af
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Jul 22 18:01:02 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Jul 23 10:49:35 2020 +0200

    test: increase accepted timeout in countLoolKitProcesses()
    
    The asan+ubsan build is slow enough that the old timeout started to
    result in an assertion failure, while just increasing the timeout seems
    to produce stable (passing) results, so do that.
    
    An ever-hanging process is still caught after this.
    
    Change-Id: I53f2c65f9a11da8423f7ff89a4b773fc2b0b1fb5
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99269
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/test/countloolkits.hpp b/test/countloolkits.hpp
index d1ebd57cd..9ee0f270f 100644
--- a/test/countloolkits.hpp
+++ b/test/countloolkits.hpp
@@ -31,8 +31,8 @@ static int countLoolKitProcesses(const int expected)
     // The shorter the better (the quicker the test runs).
     const int sleepMs = 50;
 
-    // This has to cause waiting for at least COMMAND_TIMEOUT_MS. Add one second for safety.
-    const size_t repeat = ((COMMAND_TIMEOUT_MS + 1000) / sleepMs);
+    // This has to cause waiting for at least COMMAND_TIMEOUT_MS. Tolerate more for safety.
+    const size_t repeat = ((COMMAND_TIMEOUT_MS * 8) / sleepMs);
     int count = getLoolKitProcessCount();
     for (size_t i = 0; i < repeat; ++i)
     {


More information about the Libreoffice-commits mailing list