[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-5' - uitest/impress_tests

[Rene Engelhard (via logerrit)]

 uitest/impress_tests/drawinglayer.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 677c2cf2a64ae3d92081648a3b5b5cab0bf5a347
Author:     Rene Engelhard <r...@debian.org>
AuthorDate: Sat Sep 4 19:58:13 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Dec 28 18:01:06 2021 +0100

    work around off-by-ones on i386 in uicheck uitests...
    
    <@x1sc0> _rene__, I guess we could use assertAlmostEqual with delta=1 there,
             but maybe once we add it, the next assert also fails for you?
    
    Change-Id: Ic64641ccdf9ca721997b4a842b646cf4b9e30f16
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121641
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-by: René Engelhard <r...@debian.org>
    Tested-by: René Engelhard <r...@debian.org>
    Tested-by: Jenkins
    (cherry picked from commit 46ebf8c0ad191f9d9d94c898475dd953fb48d9fd)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127368
    (cherry picked from commit 744f227e78fafb423d40f3014dde331308ea0cd0)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127369
    Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/uitest/impress_tests/drawinglayer.py 
b/uitest/impress_tests/drawinglayer.py
index 7b33e369d2e6..82fb81d257c7 100644
--- a/uitest/impress_tests/drawinglayer.py
+++ b/uitest/impress_tests/drawinglayer.py
@@ -78,7 +78,7 @@ class ImpressDrawinglayerTest(UITestCase):
         self.assertEqual(25199, document.DrawPages[0].getByIndex(0).Size.Width)
         self.assertEqual(2629, document.DrawPages[0].getByIndex(0).Size.Height)
         self.assertEqual(25199, document.DrawPages[0].getByIndex(1).Size.Width)
-        self.assertEqual(9134, document.DrawPages[0].getByIndex(1).Size.Height)
+        self.assertAlmostEqual(9134, 
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
 
         xEditWin = xImpressDoc.getChild("impress_win")
 
@@ -88,7 +88,7 @@ class ImpressDrawinglayerTest(UITestCase):
         self.assertEqual(25199, document.DrawPages[0].getByIndex(0).Size.Width)
         self.assertEqual(2629, document.DrawPages[0].getByIndex(0).Size.Height)
         self.assertEqual(12600, document.DrawPages[0].getByIndex(1).Size.Width)
-        self.assertEqual(4568, document.DrawPages[0].getByIndex(1).Size.Height)
+        self.assertAlmostEqual(4568, 
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
 
         self.assertIsNone(document.CurrentSelection)
 
@@ -127,7 +127,7 @@ class ImpressDrawinglayerTest(UITestCase):
         self.assertEqual(25199, document.DrawPages[0].getByIndex(0).Size.Width)
         self.assertEqual(2629, document.DrawPages[0].getByIndex(0).Size.Height)
         self.assertEqual(25199, document.DrawPages[0].getByIndex(1).Size.Width)
-        self.assertEqual(9134, document.DrawPages[0].getByIndex(1).Size.Height)
+        self.assertAlmostEqual(9134, 
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
         self.assertEqual(0, document.DrawPages[0].getByIndex(1).RotateAngle)
 
         xEditWin = xImpressDoc.getChild("impress_win")
@@ -138,7 +138,7 @@ class ImpressDrawinglayerTest(UITestCase):
         self.assertEqual(25199, document.DrawPages[0].getByIndex(0).Size.Width)
         self.assertEqual(2629, document.DrawPages[0].getByIndex(0).Size.Height)
         self.assertEqual(25199, document.DrawPages[0].getByIndex(1).Size.Width)
-        self.assertEqual(9134, document.DrawPages[0].getByIndex(1).Size.Height)
+        self.assertAlmostEqual(9134, 
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
         self.assertEqual(3000, document.DrawPages[0].getByIndex(1).RotateAngle)
 
         self.assertIsNone(document.CurrentSelection)