Title: [277444] trunk/Tools
Revision
277444
Author
jbed...@apple.com
Date
2021-05-13 12:23:58 -0700 (Thu, 13 May 2021)

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 (277443 => 277444)


--- trunk/Tools/CISupport/build-webkit-org/steps.py	2021-05-13 18:48:32 UTC (rev 277443)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py	2021-05-13 19:23:58 UTC (rev 277444)
@@ -644,7 +644,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 (277443 => 277444)


--- trunk/Tools/CISupport/ews-build/steps.py	2021-05-13 18:48:32 UTC (rev 277443)
+++ trunk/Tools/CISupport/ews-build/steps.py	2021-05-13 19:23:58 UTC (rev 277444)
@@ -2765,7 +2765,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 (277443 => 277444)


--- trunk/Tools/CISupport/ews-build/steps_unittest.py	2021-05-13 18:48:32 UTC (rev 277443)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py	2021-05-13 19:23:58 UTC (rev 277444)
@@ -3181,7 +3181,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='''...
@@ -3209,7 +3209,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='''...
@@ -3270,7 +3270,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='''
@@ -3312,7 +3312,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='''...
@@ -3368,7 +3368,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.')
@@ -3386,7 +3386,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='''...
@@ -3428,7 +3428,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python',
+                        command=['python3',
                                  'Tools/Scripts/run-api-tests',
                                  '--no-build',
                                  '--release',
@@ -3464,7 +3464,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python',
+                        command=['python3',
                                  'Tools/Scripts/run-api-tests',
                                  '--no-build',
                                  '--debug',

Modified: trunk/Tools/ChangeLog (277443 => 277444)


--- trunk/Tools/ChangeLog	2021-05-13 18:48:32 UTC (rev 277443)
+++ trunk/Tools/ChangeLog	2021-05-13 19:23:58 UTC (rev 277444)
@@ -1,5 +1,19 @@
 2021-05-13  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-05-13  Jonathan Bedard  <jbed...@apple.com>
+
         Few webkitpy unit-tests fails in non-PST timezones
         https://bugs.webkit.org/show_bug.cgi?id=225741
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to