summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2022-05-16 14:06:12 +0200
committerMike Kaganski <mike.kaganski@collabora.com>2022-05-16 20:22:33 +0200
commit212eeff28317543d66acec2be551d7da9ff2a87d (patch)
treec732a59a73e85a7a51635db9919be835bf5255c2
parentde-lint the .ui file for auto gtk3->gtk4 conversion (diff)
downloadcore-212eeff28317543d66acec2be551d7da9ff2a87d.tar.gz
core-212eeff28317543d66acec2be551d7da9ff2a87d.zip
Fix a UITest on Windows
Change-Id: If4e5612e2b9fa41c487a6ab54c1e23fd2d63ac9c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134365 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
-rw-r--r--sc/qa/uitest/calc_tests9/tdf95554.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/sc/qa/uitest/calc_tests9/tdf95554.py b/sc/qa/uitest/calc_tests9/tdf95554.py
index 3a8d92ce2c22..734711e415e7 100644
--- a/sc/qa/uitest/calc_tests9/tdf95554.py
+++ b/sc/qa/uitest/calc_tests9/tdf95554.py
@@ -11,6 +11,8 @@ from uitest.framework import UITestCase
from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.uihelper.calc import enter_text_to_cell
+import platform
+
class Tdf95554(UITestCase):
def test_tdf95554(self):
@@ -39,7 +41,11 @@ class Tdf95554(UITestCase):
# Without the fix, the test breaks here with:
#AssertionError: 'A\n\nC\n\nE\nF' != 'A'
- self.assertEqual('A\n\nC\n\nE\nF',
- writer_document.Text.String)
+ if platform.system() == "Windows":
+ self.assertEqual('A\r\n\r\nC\r\n\r\nE\r\nF',
+ writer_document.Text.String)
+ else:
+ self.assertEqual('A\n\nC\n\nE\nF',
+ writer_document.Text.String)
# vim: set shiftwidth=4 softtabstop=4 expandtab: \ No newline at end of file