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

[Michael Meeks]

 common/Unit.cpp      |    2 ++
 test/UnitPrefork.cpp |    6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a2ff6528bbc1070f8f099efc221ecb1e5dd37ca6
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sat Dec 3 23:02:11 2016 +0000

    UnitPrefork: bump timeouts.

diff --git a/test/UnitPrefork.cpp b/test/UnitPrefork.cpp
index 93d4adb..137ac97 100644
--- a/test/UnitPrefork.cpp
+++ b/test/UnitPrefork.cpp
@@ -49,9 +49,7 @@ public:
           _childDirty(0)
     {
         setHasKitHooks();
-#ifdef TEST_DIRTY_NUMBERS
-        setTimeout(100 * 1000);
-#endif
+        setTimeout(60 * 1000);
     }
 
     virtual void preSpawnCount(int &numPrefork) override
@@ -103,7 +101,7 @@ public:
                 LOG_INF("Getting memory of child #" << i + 1 << " of " << _childSockets.size());
 
                 _childSockets[i]->sendFrame("unit-memdump: \n", sizeof("unit-memdump: \n"));
-                if (_cv.wait_for(lock, std::chrono::milliseconds(5 * 1000)) == std::cv_status::timeout)
+                if (_cv.wait_for(lock, std::chrono::milliseconds(10 * 1000)) == std::cv_status::timeout)
                 {
                     _failure = "Timed out waiting for child to respond to unit-memdump.";
                     std::cerr << _failure << std::endl;
commit 67fcc2f99c848d14b3e2aa2fce6ee9c3641d4008
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sat Dec 3 22:40:58 2016 +0000

    Turn termination off for Unit tests.

diff --git a/common/Unit.cpp b/common/Unit.cpp
index 8b30898..53e44ca 100644
--- a/common/Unit.cpp
+++ b/common/Unit.cpp
@@ -146,6 +146,8 @@ void UnitWSD::configure(Poco::Util::LayeredConfiguration &config)
     {
         // Force HTTP - helps stracing.
         config.setBool("ssl.enable", false);
+        // Use http:// everywhere.
+        config.setBool("ssl.termination", false);
         // Force console output - easier to debug.
         config.setBool("logging.file[@enable]", false);
     }