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

Squish: Remove outdated workaround

Browse Source 
Task-number: QTCREATORBUG-6853
Change-Id: Id274e8e277338a9855ee5901c767b0f1d0f489da
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2017-03-15 15:01:27 +01:00
parent 4290081831
commit 4522f42e68
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,15 +255,9 @@ class JIRA:
# for later lookup which function to call for which bug # for later lookup which function to call for which bug
# ALWAYS update this dict when adding a new function for a workaround! # ALWAYS update this dict when adding a new function for a workaround!
def __initBugDict__(self): def __initBugDict__(self):
self.__bugs__= { self.__bugs__= {}
'QTCREATORBUG-6853':self._workaroundCreator6853_,
}
# 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):
test.fatal("No workaround found for bug %s-%d" % (bugType, number)) test.fatal("No workaround found for bug %s-%d" % (bugType, number))
############### functions that hold workarounds ################################# ############### functions that hold workarounds #################################
def _workaroundCreator6853_(self, *args):
if "Release" in args[0] and platform.system() == "Linux":
snooze(2)

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

@@ -28,9 +28,6 @@ source("../../shared/qtcreator.py")
project = "untitled" project = "untitled"
def main(): def main():
if platform.system() == "Darwin" and JIRA.isBugStillOpen(6853, JIRA.Bug.CREATOR):
test.xfail("This test is unstable on Mac, see QTCREATORBUG-6853.")
return
outputQDebug = "Output from qDebug()." outputQDebug = "Output from qDebug()."
outputStdOut = "Output from std::cout." outputStdOut = "Output from std::cout."
outputStdErr = "Output from std::cerr." outputStdErr = "Output from std::cerr."
@@ -88,7 +85,6 @@ def main():
test.log("Debugging application") test.log("Debugging application")
isMsvc = isMsvcConfig(len(checkedTargets), kit) isMsvc = isMsvcConfig(len(checkedTargets), kit)
invokeMenuItem("Debug", "Start Debugging", "Start Debugging") invokeMenuItem("Debug", "Start Debugging", "Start Debugging")
JIRA.performWorkaroundForBug(6853, JIRA.Bug.CREATOR, config)
handleDebuggerWarnings(config, isMsvc) handleDebuggerWarnings(config, isMsvc)
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")