Changeset 244533 in webkit

Timestamp:

Apr 22, 2019, 5:22:06 PM (7 years ago)

Author:

aakash_jain@apple.com

Message:

[ews-build] Improve summary for UploadBuiltProduct step
​https://bugs.webkit.org/show_bug.cgi?id=197182

Reviewed by Lucas Forschler.

• BuildSlaveSupport/ews-build/steps.py:

(UploadBuiltProduct): Added descriptionDone.
(UploadBuiltProduct.getResultSummary): Overrided getResultSummary.

• BuildSlaveSupport/ews-build/steps_unittest.py:

(TestUploadBuiltProduct.test_success): Updated unit-test.
(TestUploadBuiltProduct.test_failure): Added unit-test for failure case.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-build/steps.py (modified) (2 diffs)
• BuildSlaveSupport/ews-build/steps_unittest.py (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-build/steps.py

@@ -686 +686 @@
     workersrc = WithProperties('WebKitBuild/%(configuration)s.zip')
     masterdest = WithProperties('public_html/archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(patch_id)s.zip')
+    descriptionDone = ['Uploaded built product']
     haltOnFailure = True
 
@@ -702 +703 @@
 
         return super(UploadBuiltProduct, self).finished(results)
+
+    def getResultSummary(self):
+        if self.results != SUCCESS:
+            return {u'step': u'Failed to upload built product'}
+        return super(UploadBuiltProduct, self).getResultSummary()
 
 

trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py

@@ -890 +890 @@
         self.expectUploadedFile('public_html/archives/mac-sierra-x86_64-release/1234.zip')
 
-        self.expectOutcome(result=SUCCESS, state_string='uploading release.zip')
+        self.expectOutcome(result=SUCCESS, state_string='Uploaded built product')
+        return self.runStep()
+
+    def test_failure(self):
+        self.setupStep(UploadBuiltProduct())
+        self.setProperty('fullPlatform', 'mac-sierra')
+        self.setProperty('configuration', 'release')
+        self.setProperty('architecture', 'x86_64')
+        self.setProperty('patch_id', '1234')
+        self.expectHidden(False)
+        self.expectRemoteCommands(
+            Expect('uploadFile', dict(
+                                        workersrc='WebKitBuild/release.zip', workdir='wkdir',
+                                        blocksize=1024 * 256, maxsize=None, keepstamp=False,
+                                        writer=ExpectRemoteRef(remotetransfer.FileWriter),
+                                     ))
+            + Expect.behavior(uploadFileWithContentsOfString('Dummy zip file content.'))
+            + 1,
+        )
+        self.expectUploadedFile('public_html/archives/mac-sierra-x86_64-release/1234.zip')
+
+        self.expectOutcome(result=FAILURE, state_string='Failed to upload built product')
         return self.runStep()
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-22  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews-build] Improve summary for UploadBuiltProduct step
+        https://bugs.webkit.org/show_bug.cgi?id=197182
+
+        Reviewed by Lucas Forschler.
+
+        * BuildSlaveSupport/ews-build/steps.py:
+        (UploadBuiltProduct): Added descriptionDone.
+        (UploadBuiltProduct.getResultSummary): Overrided getResultSummary.
+        * BuildSlaveSupport/ews-build/steps_unittest.py:
+        (TestUploadBuiltProduct.test_success): Updated unit-test.
+        (TestUploadBuiltProduct.test_failure): Added unit-test for failure case.
+
 2019-04-22  Aakash Jain  <aakash_jain@apple.com>