From 4522f42e6824e2dbce6de6c95cc5d013bb42d67b Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 15 Mar 2017 15:01:27 +0100 Subject: [PATCH] Squish: Remove outdated workaround Task-number: QTCREATORBUG-6853 Change-Id: Id274e8e277338a9855ee5901c767b0f1d0f489da Reviewed-by: Christian Stenger --- tests/system/shared/workarounds.py | 8 +------- .../system/suite_debugger/tst_cli_output_console/test.py | 4 ---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/tests/system/shared/workarounds.py b/tests/system/shared/workarounds.py index cd28f4b877b..82eff0e09ca 100644 --- a/tests/system/shared/workarounds.py +++ b/tests/system/shared/workarounds.py @@ -255,15 +255,9 @@ class JIRA: # for later lookup which function to call for which bug # ALWAYS update this dict when adding a new function for a workaround! def __initBugDict__(self): - self.__bugs__= { - 'QTCREATORBUG-6853':self._workaroundCreator6853_, - } + self.__bugs__= {} # helper function - will be called if no workaround for the requested bug is deposited def _exitFatal_(self, bugType, number): test.fatal("No workaround found for bug %s-%d" % (bugType, number)) ############### functions that hold workarounds ################################# - - def _workaroundCreator6853_(self, *args): - if "Release" in args[0] and platform.system() == "Linux": - snooze(2) 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 97dd1a69375..81b0d1e56a5 100644 --- a/tests/system/suite_debugger/tst_cli_output_console/test.py +++ b/tests/system/suite_debugger/tst_cli_output_console/test.py @@ -28,9 +28,6 @@ source("../../shared/qtcreator.py") project = "untitled" 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()." outputStdOut = "Output from std::cout." outputStdErr = "Output from std::cerr." @@ -88,7 +85,6 @@ def main(): test.log("Debugging application") isMsvc = isMsvcConfig(len(checkedTargets), kit) invokeMenuItem("Debug", "Start Debugging", "Start Debugging") - JIRA.performWorkaroundForBug(6853, JIRA.Bug.CREATOR, config) handleDebuggerWarnings(config, isMsvc) ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton") outputWindow = waitForObject(":Qt Creator_Core::OutputWindow")