Attachment 345782 Details for Bug 188016 – Proposed patch

[patch] Proposed patch

ews_UploadBuiltProduct.patch (text/plain), 4.65 KB, created by Aakash Jain on 2018-07-25 13:57:32 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Aakash Jain

Created: 2018-07-25 13:57:32 PDT

Size: 4.65 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 234212)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2018-07-25  Aakash Jain  <aakash_jain@apple.com>
>+
>+        [ews-build] Add build step UploadBuiltProduct
>+        https://bugs.webkit.org/show_bug.cgi?id=188016
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * BuildSlaveSupport/ews-build/steps.py:
>+        (UploadBuiltProduct): Added build step UploadBuiltProduct.
>+        * BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-test.
>+
> 2018-07-25  Chris Dumez  <cdumez@apple.com>
> 
>         navigator.userAgent may return outdated value after webView.customUserAgent is set
>Index: Tools/BuildSlaveSupport/ews-build/steps.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/steps.py	(revision 234212)
>+++ Tools/BuildSlaveSupport/ews-build/steps.py	(working copy)
>@@ -22,7 +22,7 @@
> 
> from buildbot.process import buildstep, properties
> from buildbot.process.results import Results, SUCCESS, FAILURE, WARNINGS, SKIPPED, EXCEPTION, RETRY
>-from buildbot.steps import shell
>+from buildbot.steps import shell, transfer
> from buildbot.steps.source import svn
> from twisted.internet import defer
> 
>@@ -284,3 +284,17 @@ class RunWebKitTests(shell.Test):
>         if additionalArguments:
>             self.setCommand(self.command + additionalArguments)
>         return shell.Test.start(self)
>+
>+
>+class UploadBuiltProduct(transfer.FileUpload):
>+    name = 'upload-built-product'
>+    workersrc = WithProperties('WebKitBuild/%(configuration)s.zip')
>+    masterdest = WithProperties('public_html/archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(ewspatchid)s.zip')
>+    haltOnFailure = True
>+
>+    def __init__(self, **kwargs):
>+        kwargs['workersrc'] = self.workersrc
>+        kwargs['masterdest'] = self.masterdest
>+        kwargs['mode'] = 0644
>+        kwargs['blocksize'] = 1024 * 256
>+        transfer.FileUpload.__init__(self, **kwargs)
>Index: Tools/BuildSlaveSupport/ews-build/steps_unittest.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/steps_unittest.py	(revision 234212)
>+++ Tools/BuildSlaveSupport/ews-build/steps_unittest.py	(working copy)
>@@ -25,8 +25,9 @@ import os
> import shutil
> import tempfile
> 
>+from buildbot.process import remotetransfer
> from buildbot.process.results import Results, SUCCESS, FAILURE, WARNINGS, SKIPPED, EXCEPTION, RETRY
>-from buildbot.test.fake.remotecommand import ExpectShell
>+from buildbot.test.fake.remotecommand import Expect, ExpectRemoteRef, ExpectShell
> from buildbot.test.util.steps import BuildStepMixin
> from twisted.internet import error, reactor
> from twisted.python import failure, log
>@@ -135,6 +136,16 @@ class BuildStepMixinAdditions(BuildStepM
>         return deferred_result
> 
> 
>+def uploadFileWithContentsOfString(string, timestamp=None):
>+    def behavior(command):
>+        writer = command.args['writer']
>+        writer.remote_write(string + '\n')
>+        writer.remote_close()
>+        if timestamp:
>+            writer.remote_utime(timestamp)
>+    return behavior
>+
>+
> class TestCheckStyle(BuildStepMixinAdditions, unittest.TestCase):
>     def setUp(self):
>         self.longMessage = True
>@@ -745,5 +756,35 @@ class TestRunWebKitTests(BuildStepMixinA
>         return self.runStep()
> 
> 
>+class TestUploadBuiltProduct(BuildStepMixinAdditions, unittest.TestCase):
>+    def setUp(self):
>+        self.longMessage = True
>+        return self.setUpBuildStep()
>+
>+    def tearDown(self):
>+        return self.tearDownBuildStep()
>+
>+    def test_success(self):
>+        self.setupStep(UploadBuiltProduct())
>+        self.setProperty('fullPlatform', 'mac-sierra')
>+        self.setProperty('configuration', 'release')
>+        self.setProperty('architecture', 'x86_64')
>+        self.setProperty('ewspatchid', '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.'))
>+            + 0,
>+        )
>+        self.expectUploadedFile('public_html/archives/mac-sierra-x86_64-release/1234.zip')
>+
>+        self.expectOutcome(result=SUCCESS, state_string='uploading release.zip')
>+        return self.runStep()
>+
>+
> if __name__ == '__main__':
>     unittest.main()

Flags:

lforschler: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 188016: 345782