Modified: trunk/Tools/CISupport/ews-build/steps.py (281991 => 281992)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-09-03 14:57:41 UTC (rev 281991)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-09-03 15:02:22 UTC (rev 281992)
@@ -3250,7 +3250,7 @@
description = ['applying watchilist']
descriptionDone = ['Applied WatchList']
bug_id = WithProperties('%(bug_id)s')
- command = ['python', 'Tools/Scripts/webkit-patch', 'apply-watchlist-local', bug_id]
+ command = ['python3', 'Tools/Scripts/webkit-patch', 'apply-watchlist-local', bug_id]
haltOnFailure = True
flunkOnFailure = True
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (281991 => 281992)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-09-03 14:57:41 UTC (rev 281991)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-09-03 15:02:22 UTC (rev 281992)
@@ -337,7 +337,7 @@
ExpectShell(workdir='wkdir',
timeout=120,
logEnviron=False,
- command=['python', 'Tools/Scripts/webkit-patch', 'apply-watchlist-local', '1234'])
+ command=['python3', 'Tools/Scripts/webkit-patch', 'apply-watchlist-local', '1234'])
+ ExpectShell.log('stdio', stdout='Result of watchlist: cc "" messages ""')
+ 0,
)
@@ -351,7 +351,7 @@
ExpectShell(workdir='wkdir',
timeout=120,
logEnviron=False,
- command=['python', 'Tools/Scripts/webkit-patch', 'apply-watchlist-local', '1234'])
+ command=['python3', 'Tools/Scripts/webkit-patch', 'apply-watchlist-local', '1234'])
+ ExpectShell.log('stdio', stdout='Unexpected failure')
+ 2,
)
Modified: trunk/Tools/ChangeLog (281991 => 281992)
--- trunk/Tools/ChangeLog 2021-09-03 14:57:41 UTC (rev 281991)
+++ trunk/Tools/ChangeLog 2021-09-03 15:02:22 UTC (rev 281992)
@@ -1,3 +1,14 @@
+2021-09-03 Aakash Jain <aakash_j...@apple.com>
+
+ [ews] Invoke apply-watchlist with Python 3
+ https://bugs.webkit.org/show_bug.cgi?id=229864
+
+ Reviewed by Jonathan Bedard.
+
+ * CISupport/ews-build/steps.py:
+ (ApplyWatchList):
+ * CISupport/ews-build/steps_unittest.py:
+
2021-09-03 Chris Dumez <cdu...@apple.com>
WebKitTestRunner does not correctly close all auxiliary WebViews between tests