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

SquishTests: Remove workaround for fixed issue with open terminals

Browse Source 
This reverts commit 4c5163f675.

Task-number: QTCREATORBUG-15749
Change-Id: Icefdfe2f7e4f818f3407854619d4c6a395084af2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Löhning
2023-06-09 17:54:04 +02:00
parent 6453cfa412
commit c6e2e93bc0
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/system/shared/qtcreator.py
View File

@@ -124,17 +124,6 @@ def waitForCleanShutdown(timeOut=10):
shutdownDone=True shutdownDone=True
if not shutdownDone and datetime.utcnow() > endtime: if not shutdownDone and datetime.utcnow() > endtime:
break 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): def checkForStillRunningQmlExecutable(possibleNames):
for qmlHelper in possibleNames: for qmlHelper in possibleNames: