From 5d01b60d56a97254aa7de9842b412fae15dc6c54 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 4 Jun 2012 18:53:56 +0200 Subject: [PATCH] Squish: Avoid warning about missing Harmattan target in APTW01 Change-Id: Ibeb0477a8283d229888c4744beecfc6bd8252f3c Reviewed-by: Christian Stenger --- tests/system/shared/project.py | 4 +++- tests/system/shared/workarounds.py | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index de59f8a74a1..ac8a7add4ae 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -153,7 +153,9 @@ def __verifyFileCreation__(path, expectedFiles): # created for this version. If it is None, all Qt versions will be used # param checks turns tests in the function on if set to True def createProject_Qt_GUI(path, projectName, qtVersion = None, checks = True): - available = __createProjectSelectType__(" Applications", "Qt Gui Application") + template = "Qt Gui Application" + available = __createProjectSelectType__(" Applications", template) + JIRA.performWorkaroundIfStillOpen(6994, JIRA.Bug.CREATOR, template, available) __createProjectSetNameAndPath__(path, projectName, checks) __selectQtVersionDesktop__(qtVersion, checks, available) diff --git a/tests/system/shared/workarounds.py b/tests/system/shared/workarounds.py index 3b2e6f8da1f..dc8a8c7c12f 100644 --- a/tests/system/shared/workarounds.py +++ b/tests/system/shared/workarounds.py @@ -187,7 +187,10 @@ class JIRA: def _workaroundCreator6994_(self, *args): if args[0] in ('Mobile Qt Application', 'Qt Gui Application', 'Qt Custom Designer Widget'): - args[1].remove('Harmattan') + if QtQuickConstants.Targets.HARMATTAN in args[1]: + args[1].remove(QtQuickConstants.Targets.HARMATTAN) + else: + args[1].remove(QtQuickConstants.getStringForTarget(QtQuickConstants.Targets.HARMATTAN)) test.xverify(False, "Removed Harmattan from expected targets.") def _workaroundCreator6853_(self, *args):