From: Olivier Tilloy <olivier.tilloy@canonical.com>
Date: Fri, 17 Dec 2021 16:57:04 +0000 (+0000)
Subject: fix rounding errors that cause autopkgtests to fail on i386
X-Git-Tag: archive/raspbian/1%7.2.4-2+rpi1^2~15
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d0dae77f6a94469f87c27f81478feaba2852d466;p=libreoffice.git

fix rounding errors that cause autopkgtests to fail on i386


Gbp-Pq: Name fix-uicheck-tests-on-i386.patch
---

diff --git a/sc/qa/uitest/statistics/descriptiveStatistics.py b/sc/qa/uitest/statistics/descriptiveStatistics.py
index b0fe011fee6..134f2fbe98e 100644
--- a/sc/qa/uitest/statistics/descriptiveStatistics.py
+++ b/sc/qa/uitest/statistics/descriptiveStatistics.py
@@ -109,7 +109,7 @@ class descriptiveStatistics(UITestCase):
         self.assertEqual(round(get_cell_by_position(document, 0, 6, 7).getValue(),11) , 139.49090909091)
         self.assertEqual(round(get_cell_by_position(document, 0, 6, 8).getValue(),12) , 11.810626955878)
         self.assertEqual(round(get_cell_by_position(document, 0, 6, 9).getValue(),13) , -1.4621677980825)
-        self.assertEqual(round(get_cell_by_position(document, 0, 6, 10).getValue(),14) , 0.01524095329036)
+        self.assertEqual(round(get_cell_by_position(document, 0, 6, 10).getValue(),11) , 0.01524095329)
         self.assertEqual(get_cell_by_position(document, 0, 6, 11).getValue() , 31)
         self.assertEqual(get_cell_by_position(document, 0, 6, 12).getValue() , 26)
         self.assertEqual(get_cell_by_position(document, 0, 6, 13).getValue() , 57)
diff --git a/uitest/impress_tests/drawinglayer.py b/uitest/impress_tests/drawinglayer.py
index 7b33e369d2e..82fb81d257c 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)