Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (233527 => 233528)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2018-07-05 17:25:06 UTC (rev 233527)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2018-07-05 17:49:14 UTC (rev 233528)
@@ -300,6 +300,7 @@
class TestWebKitPyTests(BuildStepMixinAdditions, unittest.TestCase):
def setUp(self):
self.longMessage = True
+ self.jsonFileName = 'webkitpy_test_results.json'
return self.setUpBuildStep()
def tearDown(self):
@@ -309,8 +310,8 @@
self.setupStep(RunWebKitPyTests())
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
- command=['Tools/Scripts/test-webkitpy', '--json-output=webkitpy_test_results.json'],
- logfiles=RunWebKitPyTests.logfiles,
+ command=['Tools/Scripts/test-webkitpy', '--json-output={0}'.format(self.jsonFileName)],
+ logfiles={'json': self.jsonFileName},
timeout=120,
)
+ 0,
@@ -322,8 +323,8 @@
self.setupStep(RunWebKitPyTests())
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
- command=['Tools/Scripts/test-webkitpy', '--json-output=webkitpy_test_results.json'],
- logfiles=RunWebKitPyTests.logfiles,
+ command=['Tools/Scripts/test-webkitpy', '--json-output={0}'.format(self.jsonFileName)],
+ logfiles={'json': self.jsonFileName},
timeout=120,
)
+ ExpectShell.log('stdio', stdout='''Ran 1744 tests in 5.913s
Modified: trunk/Tools/ChangeLog (233527 => 233528)
--- trunk/Tools/ChangeLog 2018-07-05 17:25:06 UTC (rev 233527)
+++ trunk/Tools/ChangeLog 2018-07-05 17:49:14 UTC (rev 233528)
@@ -3,6 +3,13 @@
[ews-build] WebKitPy-Tests-EWS should output result in json
https://bugs.webkit.org/show_bug.cgi?id=187331
+ Follow-up fix to r233527. Extracting jsonFileName as a variable and re-using it.
+
+2018-07-05 Aakash Jain <[email protected]>
+
+ [ews-build] WebKitPy-Tests-EWS should output result in json
+ https://bugs.webkit.org/show_bug.cgi?id=187331
+
Reviewed by David Kilzer.
* BuildSlaveSupport/ews-build/steps.py:
