[Libreoffice-commits] online.git: Branch 'feature/paralleltest' - 3 commits - kit/Kit.cpp loolkitconfig.xcu test/Makefile.am

[Michael Meeks (via logerrit)]

Rebased ref, commits from common ancestor:
commit 41e2132808e1c8596fd544f34e5690a5b0954d29
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Jan 21 12:08:06 2020 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Jan 21 13:53:15 2020 +0000

    test: forcibly serialize more.
    
    Change-Id: I2fd370c5bdd440e3be2c065f9b834ffa4e7f856b

diff --git a/test/Makefile.am b/test/Makefile.am
index a31e557b6..7f15ef069 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -240,6 +240,7 @@ unit-wopi-documentconflict.log : unit-wopi-versionrestore.log
 unit_wopi_renamefile.log : unit-wopi-documentconflict.log
 unit_wopi_watermark.log : unit_wopi_renamefile.log
 
+# parallelize a couple at least.
 unit-http.log : unit_wopi_watermark.log
 unit-tiff-load.log : unit_wopi_watermark.log
 
@@ -248,12 +249,10 @@ unit-paste.log : unit-large-paste.log
 unit-load-torture.log : unit-paste.log
 unit-rendering-options.log : unit-load-torture.log
 unit-password-protected.log : unit-rendering-options.log
-
 unit-render-shape.log : unit-password-protected.log
-unit-each-view.log : unit-password-protected.log
-unit-session.log : unit-password-protected.log
-unit-uno-command.log : unit-password-protected.log
-
+unit-each-view.log : unit-render-shape.log
+unit-session.log : unit-each-view.log
+unit-uno-command.log : unit-session.log
 unit-load.log : unit-uno-command.log
 unit-cursor.log : unit-load.log
 unit-calc.log : unit-cursor.log
commit 14f253c14e6f6a2c46ea2485baf78497df4d577e
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Jan 21 13:36:30 2020 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Jan 21 13:53:15 2020 +0000

    Clobber gio in the configuration.
    
    Otherwise activation fails for http:// or https:// since the core
    mis-identifies the (disabled via core: 1c081112714e) gio provider
    still and won't load via the ucpdav1 provider.
    
    Change-Id: I66a58da3f94a4479729a3e39ed5070e4a05dcf69

diff --git a/loolkitconfig.xcu b/loolkitconfig.xcu
index 666b6a6cc..539186947 100644
--- a/loolkitconfig.xcu
+++ b/loolkitconfig.xcu
@@ -28,4 +28,7 @@
 <!-- Use the colibre_svg theme for the sidebar -->
 <item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="SymbolStyle" oor:op="fuse"><value>colibre_svg</value></prop></item>
 
+<!-- Disable GIO UCP we don't want -->
+<item oor:path="/org.openoffice.ucb.Configuration/ContentProviders/Local/SecondaryKeys/Office/ProviderData/Provider999"><prop oor:name="URLTemplate" oor:op="fuse"><value>NeverMatchAnyUrlSuffix</value></prop></item>
+
 </oor:items>
commit c9149187924a8684f72652db474ccca0444e83a5
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Jan 21 13:36:14 2020 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Jan 21 13:53:15 2020 +0000

    kit: show the correct documentLoad URL when a template is used.
    
    Change-Id: Ib9b3ac3e166dfbece8c7212fc239d517ce1c0bba

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 78eea14eb..34d5b86a5 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -54,6 +54,7 @@
 
 #include "ChildSession.hpp"
 #include <Common.hpp>
+#include <FileUtil.hpp>
 #include <IoUtil.hpp>
 #include "KitHelper.hpp"
 #include "Kit.hpp"
@@ -1636,13 +1637,14 @@ private:
             _jailedUrl = uri;
             _isDocPasswordProtected = false;
 
-            LOG_DBG("Calling lokit::documentLoad(" << uriAnonym << ", \"" << options << "\").");
+            const char *pURL = docTemplate.empty() ? uri.c_str() : docTemplate.c_str();
+            LOG_DBG("Calling lokit::documentLoad(" << FileUtil::anonymizeUrl(pURL) << ", \"" << options << "\").");
             const auto start = std::chrono::system_clock::now();
-            _loKitDocument.reset(_loKit->documentLoad(docTemplate.empty() ? uri.c_str() : docTemplate.c_str(), options.c_str()));
+            _loKitDocument.reset(_loKit->documentLoad(pURL, options.c_str()));
             const auto duration = std::chrono::system_clock::now() - start;
             const auto elapsed = std::chrono::duration_cast<std::chrono::microseconds>(duration).count();
             const double totalTime = elapsed/1000.;
-            LOG_DBG("Returned lokit::documentLoad(" << uriAnonym << ") in " << totalTime << "ms.");
+            LOG_DBG("Returned lokit::documentLoad(" << FileUtil::anonymizeUrl(pURL) << ") in " << totalTime << "ms.");
 #ifdef IOS
             // The iOS app (and the Android one) has max one document open at a time, so we can keep
             // a pointer to it in a global.