From ef39a087c7ab03e571d07df9825d21a3663e0e04 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 16 Dec 2015 13:24:54 +0100 Subject: [PATCH] Squish: Remove workaround for fixed bug. This completes the revert of commit 89d8693107e55800e466a5edf5d9454ad1f87c6d. Change-Id: I359ce87b0d29dc242c9ee9d7c04e025859ff5b31 Task-number: QTCREATORBUG-15456 Reviewed-by: Christian Stenger --- tests/system/shared/workarounds.py | 11 ----------- .../suite_debugger/tst_cli_output_console/test.py | 2 -- 2 files changed, 13 deletions(-) diff --git a/tests/system/shared/workarounds.py b/tests/system/shared/workarounds.py index cea2ced11aa..29ec1e281f6 100644 --- a/tests/system/shared/workarounds.py +++ b/tests/system/shared/workarounds.py @@ -261,7 +261,6 @@ class JIRA: def __initBugDict__(self): self.__bugs__= { 'QTCREATORBUG-6853':self._workaroundCreator6853_, - 'QTCREATORBUG-15456':self._workaroundCreator15456_, } # helper function - will be called if no workaround for the requested bug is deposited def _exitFatal_(self, bugType, number): @@ -272,13 +271,3 @@ class JIRA: def _workaroundCreator6853_(self, *args): if "Release" in args[0] and platform.system() == "Linux": snooze(2) - - def _workaroundCreator15456_(self, *args): - isMsvc = args[0] - isQt5 = args[1] - config = args[2] - if isMsvc and isQt5 and config != "Release": - unexpectedExitMessage = ("{type='QMessageBox' unnamed='1' visible='1' " - "windowTitle='Unexpected CDB Exit'}") - clickButton(waitForObject("{text='OK' type='QPushButton' unnamed='1' " - "visible='1' window=%s}" % unexpectedExitMessage)) diff --git a/tests/system/suite_debugger/tst_cli_output_console/test.py b/tests/system/suite_debugger/tst_cli_output_console/test.py index 8873369c4ef..a3886cd0757 100644 --- a/tests/system/suite_debugger/tst_cli_output_console/test.py +++ b/tests/system/suite_debugger/tst_cli_output_console/test.py @@ -95,8 +95,6 @@ def main(): invokeMenuItem("Debug", "Start Debugging", "Start Debugging") JIRA.performWorkaroundForBug(6853, JIRA.Bug.CREATOR, config) handleDebuggerWarnings(config, isMsvc) - JIRA.performWorkaroundForBug(15456, JIRA.Bug.CREATOR, isMsvc, - checkedTargets[kit] & ~Targets.qt4Classes(), config) ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton") outputWindow = waitForObject(":Qt Creator_Core::OutputWindow") waitFor("'Debugging has finished' in str(outputWindow.plainText)", 20000)