Commit 336511dd authored by Christian Stenger's avatar Christian Stenger
Browse files

Squish: Fix workaround



This patch fixes the workaround for QTCREATORBUG-6994 which is
crashing the Squish test tst_create_proj_wizard regularly.

Change-Id: I5d66994b49e25a2c41cf330e4bd8cf0b5269f76d
Reviewed-by: default avatarRobert Loehning <robert.loehning@nokia.com>
parent e9104546
...@@ -223,11 +223,10 @@ class JIRA: ...@@ -223,11 +223,10 @@ class JIRA:
if args[0] in ('Mobile Qt Application', 'Qt Gui Application', 'Qt Custom Designer Widget'): if args[0] in ('Mobile Qt Application', 'Qt Gui Application', 'Qt Custom Designer Widget'):
if QtQuickConstants.Targets.HARMATTAN in args[1]: if QtQuickConstants.Targets.HARMATTAN in args[1]:
args[1].remove(QtQuickConstants.Targets.HARMATTAN) args[1].remove(QtQuickConstants.Targets.HARMATTAN)
elif QtQuickConstants.getStringForTarget(QtQuickConstants.Targets.HARMATTAN) in args[1]:
args[1].remove(QtQuickConstants.getStringForTarget(QtQuickConstants.Targets.HARMATTAN))
else: else:
if args[1] and isinstance(args[1][0], (str, unicode)): test.warning('Expected Harmattan in targets, failed to find, but bug still marked as open')
args[1].remove(QtQuickConstants.getStringForTarget(QtQuickConstants.Targets.HARMATTAN))
else:
test.warning('Expected Harmattan in targets, failed to find, but bug still marked as open')
test.xverify(False, "Removed Harmattan from expected targets.") test.xverify(False, "Removed Harmattan from expected targets.")
def _workaroundCreator6853_(self, *args): def _workaroundCreator6853_(self, *args):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment