diff options
| author | Robert Loehning <robert.loehning@digia.com> | 2012-09-25 19:03:15 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@digia.com> | 2012-09-26 10:52:04 +0200 |
| commit | 021436856f02a1e4230442e28d199440688285bb (patch) | |
| tree | ae42d4f521836222c6883731700720139578a3a3 /tests | |
| parent | 471f44aae3ca09d445ae4f424b2242b371580a3e (diff) | |
| download | qt-creator-021436856f02a1e4230442e28d199440688285bb.tar.gz | |
Squish: Removed workaround for QTCREATORBUG-6994
Change-Id: Id4e5ee4f9235b768a3145e6c562e29e1662ac72d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/system/shared/project.py | 1 | ||||
| -rw-r--r-- | tests/system/shared/workarounds.py | 13 | ||||
| -rw-r--r-- | tests/system/suite_general/tst_create_proj_wizard/test.py | 1 |
3 files changed, 1 insertions, 14 deletions
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index f44eb47d11..79ebd23838 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -151,7 +151,6 @@ def __verifyFileCreation__(path, expectedFiles): def createProject_Qt_GUI(path, projectName, checks = True): template = "Qt Gui Application" available = __createProjectSelectType__(" Applications", template) - JIRA.performWorkaroundIfStillOpen(6994, JIRA.Bug.CREATOR, template, available) __createProjectSetNameAndPath__(path, projectName, checks) __selectQtVersionDesktop__(checks, available) diff --git a/tests/system/shared/workarounds.py b/tests/system/shared/workarounds.py index a1e98b7071..8b91b9f422 100644 --- a/tests/system/shared/workarounds.py +++ b/tests/system/shared/workarounds.py @@ -209,8 +209,7 @@ class JIRA: def __initBugDict__(self): self.__bugs__= { 'QTCREATORBUG-6853':self._workaroundCreator6853_, - 'QTCREATORBUG-6918':self._workaroundCreator_MacEditorFocus_, - 'QTCREATORBUG-6994':self._workaroundCreator6994_ + 'QTCREATORBUG-6918':self._workaroundCreator_MacEditorFocus_ } # helper function - will be called if no workaround for the requested bug is deposited def _exitFatal_(self, bugType, number): @@ -218,16 +217,6 @@ class JIRA: ############### functions that hold workarounds ################################# - def _workaroundCreator6994_(self, *args): - if args[0] in ('Mobile Qt Application', 'Qt Gui Application', 'Qt Custom Designer Widget'): - if QtQuickConstants.Targets.HARMATTAN in args[1]: - args[1].remove(QtQuickConstants.Targets.HARMATTAN) - elif QtQuickConstants.getStringForTarget(QtQuickConstants.Targets.HARMATTAN) in args[1]: - 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.") - def _workaroundCreator6853_(self, *args): if "Release" in args[0] and platform.system() == "Linux": snooze(2) diff --git a/tests/system/suite_general/tst_create_proj_wizard/test.py b/tests/system/suite_general/tst_create_proj_wizard/test.py index 2f2da6a7ac..60f29c4a9c 100644 --- a/tests/system/suite_general/tst_create_proj_wizard/test.py +++ b/tests/system/suite_general/tst_create_proj_wizard/test.py @@ -71,7 +71,6 @@ def main(): pass waitForObject("{type='QLabel' unnamed='1' visible='1' text='Kit Selection'}") availableCheckboxes = filter(visibleCheckBoxExists, kits.keys()) - JIRA.performWorkaroundIfStillOpen(6994, JIRA.Bug.CREATOR, template, displayedPlatforms) # verification whether expected, found and configured match for t in kits: if requiredVersion: |