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

[Jan Holesovsky]

 loolwsd/Unit.cpp           |    2 +-
 loolwsd/test/UnitAdmin.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b0af4bb3f94c2eed14ff1261872bea089a320674
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed May 4 11:36:09 2016 +0200

    Disable this test, it's unreliable.
    
    For me, it is deadlocking - while we are waiting on the condition variable,
    the tear down of the actual LOK / document is not progressing, because it is
    waiting on something.
    
    I was unable to get to the bottom of this in a reasonable time, so just
    disabled the test for the moment; Ash is working on a similar problem I think,
    so let's see if his solution helps here too (or can be applied the same way or
    something).

diff --git a/loolwsd/test/UnitAdmin.cpp b/loolwsd/test/UnitAdmin.cpp
index d0eb2b9..57aeda0 100644
--- a/loolwsd/test/UnitAdmin.cpp
+++ b/loolwsd/test/UnitAdmin.cpp
@@ -411,7 +411,7 @@ public:
         _tests.push_back(&UnitAdmin::testAddDocNotify);
         _tests.push_back(&UnitAdmin::testUsersCount);
         _tests.push_back(&UnitAdmin::testDocCount);
-        _tests.push_back(&UnitAdmin::testRmDocNotify);
+        // FIXME make this one reliable, and enable again _tests.push_back(&UnitAdmin::testRmDocNotify);
         _tests.push_back(&UnitAdmin::testUsersCount);
         _tests.push_back(&UnitAdmin::testDocCount);
     }
commit c3ac6c8287196a79f190b765eb5a9c7f1728c5fb
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed May 4 11:30:41 2016 +0200

    Better wording.

diff --git a/loolwsd/Unit.cpp b/loolwsd/Unit.cpp
index b8661a4..7630a86 100644
--- a/loolwsd/Unit.cpp
+++ b/loolwsd/Unit.cpp
@@ -68,7 +68,7 @@ bool UnitBase::init(UnitType type, const std::string &unitLibPath)
                     TimeoutThread.trySleep(_global->_timeoutMilliSeconds);
                     if (!_global->_timeoutShutdown)
                     {
-                        Log::error("Timeout");
+                        Log::error("Unit test timeout");
                         _global->timeout();
                     }
                 });