diff options
| author | Robert Loehning <robert.loehning@nokia.com> | 2012-06-04 18:53:56 +0200 |
|---|---|---|
| committer | Robert Löhning <robert.loehning@nokia.com> | 2012-06-05 11:01:00 +0200 |
| commit | 5d01b60d56a97254aa7de9842b412fae15dc6c54 (patch) | |
| tree | 4fdb99e964f9fac15ad249784d149bd02703c4c6 | |
| parent | 046f42b2821b3c595c318af1ec088b7df104b01f (diff) | |
| download | qt-creator-5d01b60d56a97254aa7de9842b412fae15dc6c54.tar.gz | |
Squish: Avoid warning about missing Harmattan target in APTW01
Change-Id: Ibeb0477a8283d229888c4744beecfc6bd8252f3c
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
| -rw-r--r-- | tests/system/shared/project.py | 4 | ||||
| -rw-r--r-- | 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 de59f8a74a..ac8a7add4a 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 3b2e6f8da1..dc8a8c7c12 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): |