feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Remove workaround for fixed bug.

Browse Source 
This completes the revert of
commit 89d8693107.

Change-Id: I359ce87b0d29dc242c9ee9d7c04e025859ff5b31
Task-number: QTCREATORBUG-15456
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Robert Loehning
2015-12-16 13:24:54 +01:00
parent e8181da0e2
commit ef39a087c7
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/system/shared/workarounds.py
View File

@@ -261,7 +261,6 @@ class JIRA:
def __initBugDict__(self): def __initBugDict__(self):
self.__bugs__= { self.__bugs__= {
'QTCREATORBUG-6853':self._workaroundCreator6853_, 'QTCREATORBUG-6853':self._workaroundCreator6853_,
'QTCREATORBUG-15456':self._workaroundCreator15456_,
} }
# helper function - will be called if no workaround for the requested bug is deposited # helper function - will be called if no workaround for the requested bug is deposited
def _exitFatal_(self, bugType, number): def _exitFatal_(self, bugType, number):
@@ -272,13 +271,3 @@ class JIRA:
def _workaroundCreator6853_(self, *args): def _workaroundCreator6853_(self, *args):
if "Release" in args[0] and platform.system() == "Linux": if "Release" in args[0] and platform.system() == "Linux":
snooze(2) 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))

2
tests/system/suite_debugger/tst_cli_output_console/test.py
View File

@@ -95,8 +95,6 @@ def main():
invokeMenuItem("Debug", "Start Debugging", "Start Debugging") invokeMenuItem("Debug", "Start Debugging", "Start Debugging")
JIRA.performWorkaroundForBug(6853, JIRA.Bug.CREATOR, config) JIRA.performWorkaroundForBug(6853, JIRA.Bug.CREATOR, config)
handleDebuggerWarnings(config, isMsvc) handleDebuggerWarnings(config, isMsvc)
JIRA.performWorkaroundForBug(15456, JIRA.Bug.CREATOR, isMsvc,
checkedTargets[kit] & ~Targets.qt4Classes(), config)
ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton") ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton")
outputWindow = waitForObject(":Qt Creator_Core::OutputWindow") outputWindow = waitForObject(":Qt Creator_Core::OutputWindow")
waitFor("'Debugging has finished' in str(outputWindow.plainText)", 20000) waitFor("'Debugging has finished' in str(outputWindow.plainText)", 20000)