summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@theqtcompany.com>2015-12-16 13:24:54 +0100
committerRobert Loehning <robert.loehning@theqtcompany.com>2016-01-05 15:36:58 +0000
commitef39a087c7ab03e571d07df9825d21a3663e0e04 (patch)
tree8a94f617962a6c28f78ee977f0c467eb6313d4f2 /tests
parente8181da0e28ace8e0e84d965376e071b5a97f8f2 (diff)
downloadqt-creator-ef39a087c7ab03e571d07df9825d21a3663e0e04.tar.gz
Squish: Remove workaround for fixed bug.
This completes the revert of commit 89d8693107e55800e466a5edf5d9454ad1f87c6d. Change-Id: I359ce87b0d29dc242c9ee9d7c04e025859ff5b31 Task-number: QTCREATORBUG-15456 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/system/shared/workarounds.py11
-rw-r--r--tests/system/suite_debugger/tst_cli_output_console/test.py2
2 files changed, 0 insertions, 13 deletions
diff --git a/tests/system/shared/workarounds.py b/tests/system/shared/workarounds.py
index cea2ced11a..29ec1e281f 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 8873369c4e..a3886cd075 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)