sw/qa/extras/uiwriter/uiwriter3.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 99ad44515c45e98635d382ebfec82b0a09217f9e
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Tue May 14 11:24:35 2024 +0200
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat May 18 22:28:58 2024 +0200

    sw: make testTdf131963 less strict
    
    Asserting number of pages is rather questionable because any number of
    things can change that and you will spend days debugging that.
    
    For some reason this test has 12 pages on my libreoffice-24-2 branch
    build and 11 pages on my master build, either of which are clearly
    better than the 2 pages result of the bug that was fixed there.
    
    Change-Id: Ie1e97d5cc973f317a2d6ca8a7d13822385b134f4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167627
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 9aa22abcbdfe42e516ecc791605e3a1b7ef80327)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167465
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index f705e881f1dd..ba8d03ae7e6c 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -1333,7 +1333,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf131963)
 {
     createSwDoc("tdf131963.docx");
 
-    CPPUNIT_ASSERT_EQUAL(11, getPages());
+    CPPUNIT_ASSERT(11 == getPages() || 12 == getPages());
 
     dispatchCommand(mxComponent, ".uno:SelectAll", {});
 
@@ -1348,7 +1348,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf131963)
     // Without the fix in place, this test would have crashed here
 
     // tdf#133169: without the fix in place, it would have been 2 instead of 11
-    CPPUNIT_ASSERT_EQUAL(11, getPages());
+    CPPUNIT_ASSERT(11 == getPages() || 12 == getPages());
 }
 
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132596)

Reply via email to