Diff
Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (281672 => 281673)
--- trunk/Tools/CISupport/build-webkit-org/steps.py 2021-08-26 23:09:52 UTC (rev 281672)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py 2021-08-26 23:24:19 UTC (rev 281673)
@@ -171,7 +171,7 @@
name = "kill-old-processes"
description = ["killing old processes"]
descriptionDone = ["killed old processes"]
- command = ["python", "./Tools/CISupport/kill-old-processes", "buildbot"]
+ command = ["python3", "./Tools/CISupport/kill-old-processes", "buildbot"]
class TriggerCrashLogSubmission(shell.Compile):
Modified: trunk/Tools/CISupport/build-webkit-org/steps_unittest.py (281672 => 281673)
--- trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-08-26 23:09:52 UTC (rev 281672)
+++ trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-08-26 23:24:19 UTC (rev 281673)
@@ -237,7 +237,7 @@
workdir='wkdir',
timeout=1200,
logEnviron=True,
- command=['python', './Tools/CISupport/kill-old-processes', 'buildbot'],
+ command=['python3', './Tools/CISupport/kill-old-processes', 'buildbot'],
) + 0,
)
self.expectOutcome(result=SUCCESS, state_string='killed old processes')
@@ -250,7 +250,7 @@
workdir='wkdir',
timeout=1200,
logEnviron=True,
- command=['python', './Tools/CISupport/kill-old-processes', 'buildbot'],
+ command=['python3', './Tools/CISupport/kill-old-processes', 'buildbot'],
) + 2
+ ExpectShell.log('stdio', stdout='Unexpected error.'),
)
Modified: trunk/Tools/CISupport/ews-build/steps.py (281672 => 281673)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-08-26 23:09:52 UTC (rev 281672)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-08-26 23:24:19 UTC (rev 281673)
@@ -2089,7 +2089,7 @@
name = 'kill-old-processes'
description = ['killing old processes']
descriptionDone = ['Killed old processes']
- command = ['python', 'Tools/CISupport/kill-old-processes', 'buildbot']
+ command = ['python3', 'Tools/CISupport/kill-old-processes', 'buildbot']
def __init__(self, **kwargs):
super(KillOldProcesses, self).__init__(timeout=2 * 60, logEnviron=False, **kwargs)
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (281672 => 281673)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-08-26 23:09:52 UTC (rev 281672)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-08-26 23:24:19 UTC (rev 281673)
@@ -816,7 +816,7 @@
self.setupStep(KillOldProcesses())
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
- command=['python', 'Tools/CISupport/kill-old-processes', 'buildbot'],
+ command=['python3', 'Tools/CISupport/kill-old-processes', 'buildbot'],
logEnviron=False,
timeout=120,
)
@@ -829,7 +829,7 @@
self.setupStep(KillOldProcesses())
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
- command=['python', 'Tools/CISupport/kill-old-processes', 'buildbot'],
+ command=['python3', 'Tools/CISupport/kill-old-processes', 'buildbot'],
logEnviron=False,
timeout=120,
)
Modified: trunk/Tools/CISupport/kill-old-processes (281672 => 281673)
--- trunk/Tools/CISupport/kill-old-processes 2021-08-26 23:09:52 UTC (rev 281672)
+++ trunk/Tools/CISupport/kill-old-processes 2021-08-26 23:24:19 UTC (rev 281673)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2010 Apple Inc. All rights reserved.
# Copyright (C) 2011 Google Inc. All rights reserved.
#
@@ -51,6 +51,8 @@
def orphanedShmSegmentsByUser(username):
ret = []
output = subprocess.check_output(["ipcs", "-m"])
+ if type(output) == bytes:
+ output = output.decode('utf-8', errors='strict')
lines = output.split('\n')
if len(lines) < 3:
return []
Modified: trunk/Tools/ChangeLog (281672 => 281673)
--- trunk/Tools/ChangeLog 2021-08-26 23:09:52 UTC (rev 281672)
+++ trunk/Tools/ChangeLog 2021-08-26 23:24:19 UTC (rev 281673)
@@ -1,3 +1,21 @@
+2021-08-26 Jonathan Bedard <jbed...@apple.com>
+
+ [kill-old-processes] Invoke with Python 3
+ https://bugs.webkit.org/show_bug.cgi?id=229576
+ <rdar://problem/82397885>
+
+ Rubber-stamped by Darin Adler.
+
+ * CISupport/build-webkit-org/steps.py:
+ (KillOldProcesses): Invoke with Python 3.
+ * CISupport/build-webkit-org/steps_unittest.py:
+ (TestKillOldProcesses.test_success):
+ (TestKillOldProcesses.test_failure):
+ * CISupport/ews-build/steps.py:
+ (KillOldProcesses): Invoke with Python 3.
+ * CISupport/ews-build/steps_unittest.py:
+ * CISupport/kill-old-processes: Change shebang to Python 3.
+
2021-08-26 Ryan Haddad <ryanhad...@apple.com>
watchOS simulator image missing on bot watchers dashboard
