[Libreoffice-commits] core.git: sw/qa

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Fri Oct 9 15:07:15 UTC 2020


 dev/null                            |binary
 sw/qa/extras/uiwriter/uiwriter3.cxx |   48 ------------------------------------
 2 files changed, 48 deletions(-)

New commits:
commit 3273170cf63b37f415b21f560e300847bfd2ecde
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Oct 9 11:01:55 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Oct 9 17:06:35 2020 +0200

    Revert "tdf#136728 : sw_uiwriter: Add unittest"
    
    This reverts commit 1da5f05be97b2cf4fa59adff6a77bdb70927202b.  It not only
    failed on Windows (for reasons that have apparently been left unidentified and
    been worked around with a
    
      #if !defined(_WIN32) // FIXME: For some reason, jenkins win build hangs here
    
    instead), but also caused CppunitTest_sw_uiwriter to livelock with an ever
    growing
    
    > [...]
    > warn:vcl.schedule:1999952:1999952:vcl/source/app/svapp.cxx:469: ProcessEventsToIdle: 197000
    > warn:vcl.schedule:1999952:1999952:vcl/source/app/svapp.cxx:469: ProcessEventsToIdle: 198000
    > warn:vcl.schedule:1999952:1999952:vcl/source/app/svapp.cxx:469: ProcessEventsToIdle: 199000
    > warn:vcl.schedule:1999952:1999952:vcl/source/app/svapp.cxx:469: ProcessEventsToIdle: 200000
    > warn:vcl.schedule:1999952:1999952:vcl/source/app/svapp.cxx:469: ProcessEventsToIdle: 201000
    > warn:vcl.schedule:1999952:1999952:vcl/source/app/svapp.cxx:469: ProcessEventsToIdle: 202000
    > warn:vcl.schedule:1999952:1999952:vcl/source/app/svapp.cxx:469: ProcessEventsToIdle: 203000
    > warn:vcl.schedule:1999952:1999952:vcl/source/app/svapp.cxx:469: ProcessEventsToIdle: 204000
    > warn:vcl.schedule:1999952:1999952:vcl/source/app/svapp.cxx:469: ProcessEventsToIdle: 205000
    > warn:vcl.schedule:1999952:1999952:vcl/source/app/svapp.cxx:469: ProcessEventsToIdle: 206000
    > warn:vcl.schedule:1999952:1999952:vcl/source/app/svapp.cxx:469: ProcessEventsToIdle: 207000
    > warn:vcl.schedule:1999952:1999952:vcl/source/app/svapp.cxx:469: ProcessEventsToIdle: 208000
    > [...]
    
    in (slow) Linux ASan+UBSan builds, see the comments at
    <https://gerrit.libreoffice.org/c/core/+/103774/
    5#message-06686b4d0405e60dd1841e67d32e5e1bd1e37b2b> and
    <https://gerrit.libreoffice.org/c/core/+/103774/5
    #message-83d13c67c69236f3f6eb889410b22c8eaef37123> "tdf#136728 : sw_uiwriter:
    Add unittest".  So until the underlying issue has been identified and solved,
    temporarily remove the test again to get builds unstuck.
    
    Change-Id: I98ad59f5db7b744cadc5051c8e7daf79542a1787
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103986
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/qa/extras/uiwriter/data3/tdf136728.odt b/sw/qa/extras/uiwriter/data3/tdf136728.odt
deleted file mode 100644
index a343938ed59f..000000000000
Binary files a/sw/qa/extras/uiwriter/data3/tdf136728.odt and /dev/null differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx b/sw/qa/extras/uiwriter/uiwriter3.cxx
index dc98dfffd686..eb42824287d9 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -73,54 +73,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf129382)
     CPPUNIT_ASSERT_EQUAL(8, getShapes());
 }
 
-CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf136728)
-{
-#if !defined(_WIN32) // FIXME: For some reason, jenkins win build hangs here
-
-    load(DATA_DIRECTORY, "tdf136728.odt");
-
-    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get());
-    CPPUNIT_ASSERT(pTextDoc);
-
-    CPPUNIT_ASSERT_EQUAL(39, getPages());
-
-    dispatchCommand(mxComponent, ".uno:SelectAll", {});
-
-    SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
-    rtl::Reference<SwTransferable> xTransfer = new SwTransferable(*pWrtShell);
-    xTransfer->Cut();
-    Scheduler::ProcessEventsToIdle();
-
-    CPPUNIT_ASSERT_EQUAL(1, getPages());
-
-    TransferableDataHelper aHelper(xTransfer.get());
-    SwTransferable::Paste(*pWrtShell, aHelper);
-    Scheduler::ProcessEventsToIdle();
-
-    CPPUNIT_ASSERT_EQUAL(39, getPages());
-
-    dispatchCommand(mxComponent, ".uno:JumpToNextTable", {});
-
-    dispatchCommand(mxComponent, ".uno:DeleteTable", {});
-    Scheduler::ProcessEventsToIdle();
-
-    CPPUNIT_ASSERT_EQUAL(1, getPages());
-
-    SwTransferable::Paste(*pWrtShell, aHelper);
-    Scheduler::ProcessEventsToIdle();
-
-    CPPUNIT_ASSERT_EQUAL(39, getPages());
-
-    dispatchCommand(mxComponent, ".uno:JumpToNextTable", {});
-
-    dispatchCommand(mxComponent, ".uno:DeleteTable", {});
-    Scheduler::ProcessEventsToIdle();
-
-    // Without the fix in place, this test would have crashed here
-    CPPUNIT_ASSERT_EQUAL(1, getPages());
-#endif
-}
-
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf134227)
 {
     load(DATA_DIRECTORY, "tdf134227.docx");


More information about the Libreoffice-commits mailing list