From 4916039bbf605650d1c7e3416642db81c0c0c25e Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sat, 25 Mar 2023 16:22:01 +0000 Subject: [PATCH] disable-flaky-tests 14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some system dependent way) e.g. on the Win@6 tinderbox it always crashes 14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some of the time Gbp-Pq: Name disable-flaky-tests.diff --- chart2/Module_chart2.mk | 2 +- sc/qa/unoapi/sc_1.sce | 7 ---- sc/qa/unoapi/sc_2.sce | 5 --- svx/qa/unoapi/svx.sce | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 48 +++++++++++------------ sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 4 +- toolkit/Module_toolkit.mk | 8 ++-- uitest/writer_tests/tdf79236.py | 3 ++ 8 files changed, 35 insertions(+), 44 deletions(-) diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk index c044d016a91..ba9c549e871 100644 --- a/chart2/Module_chart2.mk +++ b/chart2/Module_chart2.mk @@ -34,9 +34,9 @@ $(eval $(call gb_Module_add_slowcheck_targets,chart2,\ CppunitTest_chart2_export \ CppunitTest_chart2_import \ CppunitTest_chart2_trendcalculators \ - CppunitTest_chart2_dump \ CppunitTest_chart2_pivot_chart_test \ )) +# CppunitTest_chart2_dump \ ifeq ($(ENABLE_CHART_TESTS),TRUE) ifeq ($(WITH_FONTS), TRUE) diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce index fa1684ca01c..cc8e1a5bd74 100644 --- a/sc/qa/unoapi/sc_1.sce +++ b/sc/qa/unoapi/sc_1.sce @@ -24,10 +24,3 @@ # i84554 -o sc.AccessibleEditableTextPara_PreviewNote # i88241 -o sc.AccessibleEditableTextPara_HeaderFooter -o sc.AccessibleEditableTextPara_PreviewCell --o sc.ScAccessibleCell -# i91044 -o sc.ScAccessibleCsvCell -# i91044 -o sc.ScAccessibleCsvGrid -# i84641 -o sc.ScAccessibleCsvRuler -# i88330 -o sc.ScAccessibleDocument -# i91045 -o sc.ScAccessibleDocumentPagePreview --o sc.ScAccessiblePageHeader diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce index d934bc7a79e..b6c268ed987 100644 --- a/sc/qa/unoapi/sc_2.sce +++ b/sc/qa/unoapi/sc_2.sce @@ -15,11 +15,6 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# fdo#FOO -o sc.ScAccessiblePageHeaderArea --o sc.ScAccessiblePreviewCell --o sc.ScAccessiblePreviewHeaderCell --o sc.ScAccessiblePreviewTable -# fdo#45337 -o sc.ScAccessibleSpreadsheet # FIXME_REMOVE_WHEN_RE_BASE_COMPLETE # -o sc.ScAnnotationObj # -o sc.ScAnnotationShapeObj diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce index 1c3925f5898..a16f0014e44 100644 --- a/svx/qa/unoapi/svx.sce +++ b/svx/qa/unoapi/svx.sce @@ -25,7 +25,7 @@ #i111216 -o svx.AccessiblePresentationGraphicShape #i111216 -o svx.AccessiblePresentationOLEShape #i85539 -o svx.AccessiblePresentationShape --o svx.AccessibleShape +#-o svx.AccessibleShape #i90294 -o svx.GraphicExporter -o svx.SvxDrawPage #i85501 -o svx.SvxGraphCtrlAccessibleContext diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx index 3e8a6e0fe33..9eec4cbb8bb 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx @@ -1128,30 +1128,30 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt") -DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt") -{ - xmlDocPtr pXmlDoc = parseExport("word/document.xml"); - if (!pXmlDoc) - return; - // there should be no flipH and flipV attributes in this case - assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH"); - assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV"); - // check rotation angle - assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000"); - // check the first few coordinates of the polygon -#ifndef MACOSX /* Retina-related rounding roundtrip error - * hard to smooth out due to the use of string compare - * instead of number */ -#if !defined(_WIN32) - assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351"); - assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171"); - assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695"); - assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171"); - assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695"); - assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701"); -#endif -#endif -} +//DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt") +//{ +// xmlDocPtr pXmlDoc = parseExport("word/document.xml"); +// if (!pXmlDoc) +// return; +// // there should be no flipH and flipV attributes in this case +// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH"); +// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV"); +// // check rotation angle +// assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000"); +// // check the first few coordinates of the polygon +//#ifndef MACOSX /* Retina-related rounding roundtrip error +// * hard to smooth out due to the use of string compare +// * instead of number */ +//#if !defined(_WIN32) +// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351"); +// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171"); +// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695"); +// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171"); +// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695"); +// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701"); +//#endif +//#endif +//} CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx index 45480023495..1415308e434 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx @@ -189,13 +189,13 @@ DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx") getProperty(xText, "CharColor")); } -DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx") +/*DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx") { // the position of the flying text frame should be off page // 30624 below its anchor OUString aTop = parseDump("//fly[1]/infos/bounds", "top"); CPPUNIT_ASSERT_EQUAL(OUString("30624"), aTop); -} +}*/ // DOCX: Textbox wrap differs in MSO and LO // Both should layout text regardless of existing text box diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk index 21fd5ae92cd..6d5bb10b55b 100644 --- a/toolkit/Module_toolkit.mk +++ b/toolkit/Module_toolkit.mk @@ -33,11 +33,11 @@ endif ifneq ($(OOO_JUNIT_JAR),) $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\ JunitTest_toolkit_complex \ - JunitTest_toolkit_unoapi_1 \ - JunitTest_toolkit_unoapi_2 \ - JunitTest_toolkit_unoapi_3 \ - JunitTest_toolkit_unoapi_4 \ )) endif +# JunitTest_toolkit_unoapi_1 \ +# JunitTest_toolkit_unoapi_2 \ +# JunitTest_toolkit_unoapi_3 \ +# JunitTest_toolkit_unoapi_4 \ # vim: set noet sw=4 ts=4: diff --git a/uitest/writer_tests/tdf79236.py b/uitest/writer_tests/tdf79236.py index 8585e48d8c6..704f42c009a 100644 --- a/uitest/writer_tests/tdf79236.py +++ b/uitest/writer_tests/tdf79236.py @@ -8,8 +8,11 @@ from uitest.framework import UITestCase import time from uitest.uihelper.common import get_state_as_dict, type_text +import unittest + class tdf79236(UITestCase): + @unittest.skip("Currently broken") def test_paragraph(self): self.ui_test.create_doc_in_start_center("writer") -- 2.30.2