Log Message
[run-api-tests] Use Python 3 (Part 1) https://bugs.webkit.org/show_bug.cgi?id=225427 <rdar://problem/77584713>
Reviewed by Aakash Jain. * CISupport/build-webkit-org/steps.py: (RunAPITests): Use Python3 to invoke run-api-tests. * CISupport/ews-build/steps.py: (RunAPITests): Use Python3 to invoke run-api-tests. * CISupport/ews-build/steps_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (279848 => 279849)
--- trunk/Tools/CISupport/build-webkit-org/steps.py 2021-07-12 20:45:53 UTC (rev 279848)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py 2021-07-12 20:46:41 UTC (rev 279849)
@@ -648,7 +648,7 @@
jsonFileName = "api_test_results.json"
logfiles = {"json": jsonFileName}
command = [
- "python",
+ "python3",
"./Tools/Scripts/run-api-tests",
"--no-build",
"--json-output={0}".format(jsonFileName),
Modified: trunk/Tools/CISupport/ews-build/steps.py (279848 => 279849)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-07-12 20:45:53 UTC (rev 279848)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-07-12 20:46:41 UTC (rev 279849)
@@ -2782,7 +2782,7 @@
descriptionDone = ['api-tests']
jsonFileName = 'api_test_results.json'
logfiles = {'json': jsonFileName}
- command = ['python', 'Tools/Scripts/run-api-tests', '--no-build',
+ command = ['python3', 'Tools/Scripts/run-api-tests', '--no-build',
WithProperties('--%(configuration)s'), '--verbose', '--json-output={0}'.format(jsonFileName)]
failedTestsFormatString = '%d api test%s failed or timed out'
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (279848 => 279849)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-07-12 20:45:53 UTC (rev 279848)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-07-12 20:46:41 UTC (rev 279849)
@@ -3200,7 +3200,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--release', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
+ command=['python3', 'Tools/Scripts/run-api-tests', '--no-build', '--release', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
logfiles={'json': self.jsonFileName},
)
+ ExpectShell.log('stdio', stdout='''...
@@ -3228,7 +3228,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName), '--ios-simulator'],
+ command=['python3', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName), '--ios-simulator'],
logfiles={'json': self.jsonFileName},
)
+ ExpectShell.log('stdio', stdout='''...
@@ -3289,7 +3289,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
+ command=['python3', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
logfiles={'json': self.jsonFileName},
)
+ ExpectShell.log('stdio', stdout='''
@@ -3331,7 +3331,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
+ command=['python3', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
logfiles={'json': self.jsonFileName},
)
+ ExpectShell.log('stdio', stdout='''...
@@ -3387,7 +3387,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
+ command=['python3', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
logfiles={'json': self.jsonFileName},
)
+ ExpectShell.log('stdio', stdout='Unexpected failure. Failed to run api tests.')
@@ -3405,7 +3405,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
+ command=['python3', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
logfiles={'json': self.jsonFileName},
)
+ ExpectShell.log('stdio', stdout='''...
@@ -3447,7 +3447,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- command=['python',
+ command=['python3',
'Tools/Scripts/run-api-tests',
'--no-build',
'--release',
@@ -3483,7 +3483,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- command=['python',
+ command=['python3',
'Tools/Scripts/run-api-tests',
'--no-build',
'--debug',
Modified: trunk/Tools/ChangeLog (279848 => 279849)
--- trunk/Tools/ChangeLog 2021-07-12 20:45:53 UTC (rev 279848)
+++ trunk/Tools/ChangeLog 2021-07-12 20:46:41 UTC (rev 279849)
@@ -1,3 +1,17 @@
+2021-07-12 Jonathan Bedard <jbed...@apple.com>
+
+ [run-api-tests] Use Python 3 (Part 1)
+ https://bugs.webkit.org/show_bug.cgi?id=225427
+ <rdar://problem/77584713>
+
+ Reviewed by Aakash Jain.
+
+ * CISupport/build-webkit-org/steps.py:
+ (RunAPITests): Use Python3 to invoke run-api-tests.
+ * CISupport/ews-build/steps.py:
+ (RunAPITests): Use Python3 to invoke run-api-tests.
+ * CISupport/ews-build/steps_unittest.py:
+
2021-07-12 Carlos Alberto Lopez Perez <clo...@igalia.com>
[GTK] Add a new GTK layout tester bot to build.webkit.org that runs with --skip-failing-tests switch
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
