[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/qa

[Michael Stahl (via logerrit)]

 sw/qa/uitest/writer_dialogs/openDialogs.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 17f335f27d170b29a8241d9033b63bbd6df8e97a
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Sat May 16 19:58:19 2020 +0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Tue May 19 20:24:49 2020 +0200

    sw: UITest_writer_dialogs: disable MailMergeWizard
    
    In a build via ssh, the test hangs while trying to connect to Evolution
    Data Server that presumably isn't running:
    
    1  in g_cond_wait () at /lib64/libglib-2.0.so.0
    2  in e_flag_wait () at /lib64/libedataserver-1.2.so.24
    3  in e_client_wait_for_connected_sync () at /lib64/libedataserver-1.2.so.24
    4  in e_book_client_connect_sync () at /lib64/libebook-1.2.so.20
    5  in e_book_client_connect_direct_sync () at /lib64/libebook-1.2.so.20
    6  in connectivity::evoab::(anonymous namespace)::OEvoabVersion38Helper::createClient(ESource*) (this=0x912d150, pSource=0x90c0660) at connectivity/source/drivers/evoab2/NResultSet.cxx:480
    ...
    35 in SwMailMergeConfigItem::GetResultSet() const (this=0x8f10b30) at sw/source/uibase/dbui/mmconfigitem.cxx:875
    ...
    63 in SwMailMergeWizard::SwMailMergeWizard(SwView&, std::shared_ptr<SwMailMergeConfigItem> const&) (this=0x8f0f340, rView=..., rItem=std::shared_ptr<SwMailMergeConfigItem> (use count 3, weak count 0) = {...}) at sw/source/ui/dbui/mailmergewizard.cxx:60
    
    Change-Id: I1b43b05509f4e293ce1f00044a05f045bf975ce4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94364
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit a782cce919952cff41c7cfa7ec3a6a915e1851aa)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94281
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/sw/qa/uitest/writer_dialogs/openDialogs.py b/sw/qa/uitest/writer_dialogs/openDialogs.py
index 442d0eef9095..60e126780d69 100644
--- a/sw/qa/uitest/writer_dialogs/openDialogs.py
+++ b/sw/qa/uitest/writer_dialogs/openDialogs.py
@@ -99,7 +99,8 @@ dialogs = [
     # {"command": ".uno:LineNumberingDialog", "closeButton": "cancel"},
         # tested in sw/qa/uitest/writer_tests3/lineNumbering.py
     {"command": ".uno:FootnoteDialog", "closeButton": "cancel"},
-    {"command": ".uno:MailMergeWizard", "closeButton": "cancel"},
+    # {"command": ".uno:MailMergeWizard", "closeButton": "cancel"},
+        # may hang forever in e_book_client_connect_direct_sync
     {"command": ".uno:AddressBookSource", "closeButton": "cancel"},
     {"command": ".uno:RunMacro", "closeButton": "cancel"},
     {"command": ".uno:ScriptOrganizer", "closeButton": "close"},