From 3adef3cc7c84fb24fcf9630b47d2ac91cff6dd42 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Fri, 9 Sep 2016 06:58:03 +0200
Subject: [PATCH] Squish: Remove OSX specific workaround
Change-Id: I9e43c47c5ef2422d46e10b9f2fd88454b4352c30
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
---
tests/system/shared/editor_utils.py | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/tests/system/shared/editor_utils.py b/tests/system/shared/editor_utils.py
index 588ee3e6429..e3afb02afca 100644
--- a/tests/system/shared/editor_utils.py
+++ b/tests/system/shared/editor_utils.py
@@ -344,20 +344,10 @@ def validateSearchResult(expectedCount):
def invokeContextMenuItem(editorArea, command1, command2 = None):
ctxtMenu = openContextMenuOnTextCursorPosition(editorArea)
snooze(1)
- if platform.system() == 'Darwin':
- item1 = waitForObjectItem(ctxtMenu, command1)
- subMenu = item1.menu()
- activateItem(item1)
- # subMenu could have been triggered by hovering, but closed again by clicking
- if subMenu and not subMenu.visible:
- activateItem(item1)
- if command2:
- activateItem(subMenu, command2)
- else:
- activateItem(waitForObjectItem(objectMap.realName(ctxtMenu), command1, 2000))
- if command2:
- activateItem(waitForObjectItem("{title='%s' type='QMenu' visible='1' window=%s}"
- % (command1, objectMap.realName(ctxtMenu)), command2, 2000))
+ activateItem(waitForObjectItem(objectMap.realName(ctxtMenu), command1, 2000))
+ if command2:
+ activateItem(waitForObjectItem("{title='%s' type='QMenu' visible='1' window=%s}"
+ % (command1, objectMap.realName(ctxtMenu)), command2, 2000))
# this function invokes the "Find Usages" item from context menu
# param editor an editor object
--
GitLab