From c6e2e93bc00bf37ec06ee6a69f6383bd3e2a052c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20L=C3=B6hning?= Date: Fri, 9 Jun 2023 17:54:04 +0200 Subject: [PATCH] SquishTests: Remove workaround for fixed issue with open terminals This reverts commit 4c5163f6750b91e1d945a02daec0e1bc25f12721. Task-number: QTCREATORBUG-15749 Change-Id: Icefdfe2f7e4f818f3407854619d4c6a395084af2 Reviewed-by: Christian Stenger --- tests/system/shared/qtcreator.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py index f243d00506a..7b58247571a 100644 --- a/tests/system/shared/qtcreator.py +++ b/tests/system/shared/qtcreator.py @@ -124,17 +124,6 @@ def waitForCleanShutdown(timeOut=10): shutdownDone=True if not shutdownDone and datetime.utcnow() > endtime: break - if platform.system() == 'Linux' and JIRA.isBugStillOpen(15749): - pgrepOutput = getOutputFromCmdline(["pgrep", "-f", "qtcreator_process_stub"], - acceptedError=1) - pids = pgrepOutput.splitlines() - if len(pids): - print("Killing %d qtcreator_process_stub instances" % len(pids)) - for pid in pids: - try: - os.kill(__builtin__.int(pid), 9) - except OSError: # we might kill the parent before the current pid - pass def checkForStillRunningQmlExecutable(possibleNames): for qmlHelper in possibleNames: