Title: [264229] trunk/Tools
- Revision
- 264229
- Author
- aakash_j...@apple.com
- Date
- 2020-07-10 10:21:13 -0700 (Fri, 10 Jul 2020)
Log Message
[EWS] layout-test results shouldn't be hosted on ews server
https://bugs.webkit.org/show_bug.cgi?id=201937
Rubber-stamped by Alexey Proskuryakov.
* BuildSlaveSupport/ews-build/steps.py:
(ExtractTestResults.resultDirectoryURL):
* BuildSlaveSupport/ews-build/steps_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (264228 => 264229)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-07-10 17:16:39 UTC (rev 264228)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-07-10 17:21:13 UTC (rev 264229)
@@ -37,6 +37,7 @@
BUG_SERVER_URL = 'https://bugs.webkit.org/'
S3URL = 'https://s3-us-west-2.amazonaws.com/'
+S3_RESULTS_URL = 'https://ews-build.s3-us-west-2.amazonaws.com/'
EWS_BUILD_URL = 'https://ews-build.webkit.org/'
EWS_URL = 'https://ews.webkit.org/'
WithProperties = properties.WithProperties
@@ -2418,10 +2419,12 @@
master.MasterShellCommand.__init__(self, command=self.command, logEnviron=False)
def resultDirectoryURL(self):
- return self.resultDirectory.replace('public_html/', '/') + '/'
+ path = self.resultDirectory.replace('public_html/results/', '') + '/'
+ return '{}{}'.format(S3_RESULTS_URL, path)
def resultsDownloadURL(self):
- return self.zipFile.replace('public_html/', '/')
+ path = self.zipFile.replace('public_html/results/', '')
+ return '{}{}'.format(S3_RESULTS_URL, path)
def getLastBuildStepByName(self, name):
for step in reversed(self.build.executedSteps):
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (264228 => 264229)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-07-10 17:16:39 UTC (rev 264228)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-07-10 17:21:13 UTC (rev 264229)
@@ -3057,7 +3057,7 @@
+ 0,
)
self.expectOutcome(result=SUCCESS, state_string='Extracted test results')
- self.expectAddedURLs([call('view layout test results', '/results/test/r2468_ab1a28b4feee0d42973c7c05335b35bca927e974 (1)/results.html')])
+ self.expectAddedURLs([call('view layout test results', 'https://ews-build.s3-us-west-2.amazonaws.com/macOS-Sierra-Release-WK2-Tests-EWS/r2468-12/results.html')])
return self.runStep()
def test_success_with_identifier(self):
@@ -3075,7 +3075,7 @@
+ 0,
)
self.expectOutcome(result=SUCCESS, state_string='Extracted test results')
- self.expectAddedURLs([call('view layout test results', '/results/test/r2468_ab1a28b4feee0d42973c7c05335b35bca927e974 (1)/results.html')])
+ self.expectAddedURLs([call('view layout test results', 'https://ews-build.s3-us-west-2.amazonaws.com/iOS-12-Simulator-WK2-Tests-EWS/r1234-12/results.html')])
return self.runStep()
def test_failure(self):
@@ -3093,7 +3093,7 @@
+ 2,
)
self.expectOutcome(result=FAILURE, state_string='failed (2) (failure)')
- self.expectAddedURLs([call('view layout test results', '/results/test/r2468_ab1a28b4feee0d42973c7c05335b35bca927e974 (1)/results.html')])
+ self.expectAddedURLs([call('view layout test results', 'https://ews-build.s3-us-west-2.amazonaws.com/macOS-Sierra-Release-WK2-Tests-EWS/r1234-12/results.html')])
return self.runStep()
Modified: trunk/Tools/ChangeLog (264228 => 264229)
--- trunk/Tools/ChangeLog 2020-07-10 17:16:39 UTC (rev 264228)
+++ trunk/Tools/ChangeLog 2020-07-10 17:21:13 UTC (rev 264229)
@@ -1,3 +1,14 @@
+2020-07-10 Aakash Jain <aakash_j...@apple.com>
+
+ [EWS] layout-test results shouldn't be hosted on ews server
+ https://bugs.webkit.org/show_bug.cgi?id=201937
+
+ Rubber-stamped by Alexey Proskuryakov.
+
+ * BuildSlaveSupport/ews-build/steps.py:
+ (ExtractTestResults.resultDirectoryURL):
+ * BuildSlaveSupport/ews-build/steps_unittest.py:
+
2020-07-10 Xabier Rodriguez Calvar <calva...@igalia.com>
[GStreamer][EME][OpenCDM] Implement OpenCDM support
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
