commit ab12dfe7c09aef537a82d35f2f9e51bcd8205fdf
author Caolán McNamara <caolanm@redhat.com> Wed Sep 02 20:49:06 2020 +0100
committer Miklos Vajna <vmiklos@collabora.com> Tue Sep 08 17:07:06 2020 +0200
tree 482dfea070a19b62cc28a019bce6ee5965daa593
parent 7739740ab36a933a134996427132c64dfddac49c

blind fix for tdf129346 test intermittent failure

Change-Id: Ib3bc0ce0bdeee01c3c752d935e195f677b6f6d4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101978
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 3b0f53beed3e0e21b0fc4d8efc38d404637404a0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101962
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

sd/qa/uitest/impress_tests/tdf130440.py

diff --git a/sd/qa/uitest/impress_tests/tdf130440.py b/sd/qa/uitest/impress_tests/tdf130440.py
index 31bf83c1..348feb3 100644
--- a/sd/qa/uitest/impress_tests/tdf130440.py
+++ b/sd/qa/uitest/impress_tests/tdf130440.py
@@ -15,9 +15,12 @@ class tdf129346(UITestCase):
        xCancelBtn = xTemplateDlg.getChild("cancel")
        self.ui_test.close_dialog_through_button(xCancelBtn)

        xToolkit = self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')

        document = self.ui_test.get_component()
        self.assertEqual(document.CurrentController.getCurrentPage().Number, 1)
        self.xUITest.executeCommand(".uno:DuplicatePage")
        xToolkit.processEventsToIdle()
        self.assertEqual(document.CurrentController.getCurrentPage().Number, 2)

        xDoc = self.xUITest.getTopFocusWindow()
@@ -25,20 +28,28 @@ class tdf129346(UITestCase):
        xEdit.executeAction("TYPE", mkPropertyValues({"TEXT":"test"}))

        self.xUITest.executeCommand(".uno:Undo")
        xToolkit.processEventsToIdle()
        self.assertEqual(document.CurrentController.getCurrentPage().Number, 2)

        self.xUITest.executeCommand(".uno:Undo")
        xToolkit.processEventsToIdle()
        self.assertEqual(document.CurrentController.getCurrentPage().Number, 2)

        self.xUITest.executeCommand(".uno:Undo")
        xToolkit.processEventsToIdle()
        self.assertEqual(document.CurrentController.getCurrentPage().Number, 1)

        self.xUITest.executeCommand(".uno:Redo")
        # usually passes, but sometimes it asserts with AssertionError: 1 != 2
        #self.assertEqual(document.CurrentController.getCurrentPage().Number, 2)
        xToolkit.processEventsToIdle()
        self.assertEqual(document.CurrentController.getCurrentPage().Number, 2)

        self.xUITest.executeCommand(".uno:Redo")

        xDoc = self.xUITest.getTopFocusWindow()
        xEdit = xDoc.getChild("impress_win")
        xEdit.executeAction("TYPE", mkPropertyValues({"TEXT":"test"}))

        xToolkit.processEventsToIdle()
        #Without the accompanying fix in place, it would fail with AssertionError: 2 != 1
        self.assertEqual(document.CurrentController.getCurrentPage().Number, 2)
        self.ui_test.close_doc()