Attachment 349165 Details for Bug 189417 – Patch for landing

[patch] Patch for landing

ews_api-test-json-v2.patch (text/plain), 5.76 KB, created by Aakash Jain on 2018-09-07 11:12:08 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Aakash Jain

Created: 2018-09-07 11:12:08 PDT

Size: 5.76 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 235787)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2018-09-07  Aakash Jain  <aakash_jain@apple.com>
>+
>+        [ews-build] API tests should output result summary in json
>+        https://bugs.webkit.org/show_bug.cgi?id=189417
>+
>+        Reviewed by Lucas Forschler.
>+
>+        * BuildSlaveSupport/ews-build/steps.py:
>+        (RunAPITests): Passed --json-output parameter to run-api-tests.
>+        * BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
>+
> 2018-09-07  Yoshiaki Jitsukawa  <yoshiaki.jitsukawa@sony.com>
> 
>         [RunLoopGeneric] OneShotTimer should be inactive when fired.
>Index: Tools/BuildSlaveSupport/ews-build/steps.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/steps.py	(revision 235786)
>+++ Tools/BuildSlaveSupport/ews-build/steps.py	(working copy)
>@@ -479,7 +479,10 @@ class RunAPITests(TestWithFailureCount):
>     name = 'run-api-tests'
>     description = ['api tests running']
>     descriptionDone = ['api-tests']
>-    command = ['python', 'Tools/Scripts/run-api-tests', '--no-build', WithProperties('--%(configuration)s'), '--verbose']
>+    jsonFileName = 'api_test_results.json'
>+    logfiles = {'json': jsonFileName}
>+    command = ['python', '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'
> 
>     def start(self):
>Index: Tools/BuildSlaveSupport/ews-build/steps_unittest.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/steps_unittest.py	(revision 235786)
>+++ Tools/BuildSlaveSupport/ews-build/steps_unittest.py	(working copy)
>@@ -928,6 +928,7 @@ class TestExtractBuiltProduct(BuildStepM
> class TestRunAPITests(BuildStepMixinAdditions, unittest.TestCase):
>     def setUp(self):
>         self.longMessage = True
>+        self.jsonFileName = 'api_test_results.json'
>         return self.setUpBuildStep()
> 
>     def tearDown(self):
>@@ -941,7 +942,8 @@ class TestRunAPITests(BuildStepMixinAddi
> 
>         self.expectRemoteCommands(
>             ExpectShell(workdir='wkdir',
>-                        command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--release', '--verbose'],
>+                        command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--release', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
>+                        logfiles={'json': self.jsonFileName},
>                         )
>             + ExpectShell.log('stdio', stdout='''...
> worker/0 TestWTF.WTF_Variant.OperatorAmpersand Passed
>@@ -967,7 +969,8 @@ All tests successfully passed!
> 
>         self.expectRemoteCommands(
>             ExpectShell(workdir='wkdir',
>-                        command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--ios-simulator'],
>+                        command=['python', '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='''...
> worker/0 TestWTF.WTF_Variant.OperatorAmpersand Passed
>@@ -993,7 +996,8 @@ All tests successfully passed!
> 
>         self.expectRemoteCommands(
>             ExpectShell(workdir='wkdir',
>-                        command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose'],
>+                        command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
>+                        logfiles={'json': self.jsonFileName},
>                         )
>             + ExpectShell.log('stdio', stdout='''
> worker/0 TestWTF.WTF_Variant.OperatorAmpersand Passed
>@@ -1033,7 +1037,8 @@ Testing completed, Exit status: 3
> 
>         self.expectRemoteCommands(
>             ExpectShell(workdir='wkdir',
>-                        command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose'],
>+                        command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
>+                        logfiles={'json': self.jsonFileName},
>                         )
>             + ExpectShell.log('stdio', stdout='''...
> worker/0 TestWTF.WTF_Variant.OperatorAmpersand Passed
>@@ -1087,7 +1092,8 @@ Testing completed, Exit status: 3
> 
>         self.expectRemoteCommands(
>             ExpectShell(workdir='wkdir',
>-                        command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose'],
>+                        command=['python', '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.')
>             + 2,
>@@ -1103,7 +1109,8 @@ Testing completed, Exit status: 3
> 
>         self.expectRemoteCommands(
>             ExpectShell(workdir='wkdir',
>-                        command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose'],
>+                        command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
>+                        logfiles={'json': self.jsonFileName},
>                         )
>             + ExpectShell.log('stdio', stdout='''...
> worker/0 TestWTF.WTF_Variant.OperatorAmpersand Passed

Actions: View | Formatted Diff | Diff

Attachments on bug 189417: 349159 | 349165