summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2017-08-02 09:31:44 +0200
committerChristian Stenger <christian.stenger@qt.io>2017-08-07 11:02:09 +0000
commite45f4af3d47afaa9a3e58652405f8010e00271a9 (patch)
treedb598a17de850ddf1e9fafa79fc24a8af582dde4 /tests
parentd93af8c90f133354cffd65bfffc4d23f9e60a14c (diff)
downloadqt-creator-e45f4af3d47afaa9a3e58652405f8010e00271a9.tar.gz
Squish: Work around Squish issue on macOS if necessary
Change-Id: Ib6a6179ba51a907ee5e7aa1a6e30f345da217e52 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/system/suite_HELP/tst_HELP02/test.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/system/suite_HELP/tst_HELP02/test.py b/tests/system/suite_HELP/tst_HELP02/test.py
index f246a41b6c..e3fc68cb40 100755
--- a/tests/system/suite_HELP/tst_HELP02/test.py
+++ b/tests/system/suite_HELP/tst_HELP02/test.py
@@ -91,8 +91,14 @@ def setKeyboardShortcutForAboutQtC():
expected = 'Ctrl+Alt+A'
if platform.system() == 'Darwin':
expected = 'Ctrl+Opt+A'
- test.verify(waitFor("str(findObject(shortcut).text) == expected", 5000),
- "Expected key sequence is displayed.")
+
+ shortcutMatches = waitFor("str(findObject(shortcut).text) == expected", 5000)
+ if not shortcutMatches and platform.system() == 'Darwin':
+ test.warning("Squish Issue: shortcut was set to %s - entering it manually now"
+ % waitForObject(shortcut).text)
+ replaceEditorContent(shortcut, expected)
+ else:
+ test.verify(shortcutMatches, "Expected key sequence is displayed.")
clickButton(waitForObject(":Options.OK_QPushButton"))
def main():