diff options
| author | Robert Loehning <robert.loehning@qt.io> | 2017-03-15 15:01:27 +0100 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@qt.io> | 2017-03-20 10:17:03 +0000 |
| commit | 4522f42e6824e2dbce6de6c95cc5d013bb42d67b (patch) | |
| tree | 9a0ef51bb2aa0197e426502667080d64d16b7317 /tests | |
| parent | 42900818318fd495a16a9eb835331af7fd4e5e8e (diff) | |
Squish: Remove outdated workaround
Task-number: QTCREATORBUG-6853
Change-Id: Id274e8e277338a9855ee5901c767b0f1d0f489da
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/system/shared/workarounds.py | 8 | ||||
| -rw-r--r-- | tests/system/suite_debugger/tst_cli_output_console/test.py | 4 |
2 files changed, 1 insertions, 11 deletions
diff --git a/tests/system/shared/workarounds.py b/tests/system/shared/workarounds.py index cd28f4b877..82eff0e09c 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 97dd1a6937..81b0d1e56a 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") |