Attachment 343631 Details for Bug 187061 – Patch

[patch] Patch

bug-187061-20180626130656.patch (text/plain), 2.64 KB, created by Daniel Bates on 2018-06-26 13:06:56 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2018-06-26 13:06:56 PDT

Size: 2.64 KB

patch

obsolete

>Subversion Revision: 233189
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 8899e03ddb67031ba860049abe93ce0021189b92..24380ed7c692444e3acc2261dd02b01d868ffea8 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,5 +1,22 @@
> 2018-06-26  Daniel Bates  <dabates@apple.com>
> 
>+        EWS should pass --status-host-uses-http when invoking webkit-patch, if needed
>+        https://bugs.webkit.org/show_bug.cgi?id=187061
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        When EWS invokes webkit-patch to perform an operation (e.g. apply an attachment)
>+        it should pass the command line option --status-host-uses-http, if EWS was
>+        started with this command line option, so that we query the status server over
>+        HTTP in child "webkit-patch" processes as we do in the main EWS process.
>+
>+        * Scripts/webkitpy/common/net/statusserver_mock.py:
>+        (MockStatusServer.__init__):
>+        * Scripts/webkitpy/tool/commands/queues.py:
>+        (AbstractQueue.run_webkit_patch):
>+
>+2018-06-26  Daniel Bates  <dabates@apple.com>
>+
>         webkit-patch: Make attachment commands work with status-server hosted attachments
>         https://bugs.webkit.org/show_bug.cgi?id=187056
> 
>diff --git a/Tools/Scripts/webkitpy/common/net/statusserver_mock.py b/Tools/Scripts/webkitpy/common/net/statusserver_mock.py
>index 8de0a5151c0c077ae18af1faae2b58f900f79d44..9c90ab25a6b757b62d7eb6bd57d0c79f2c5952d9 100644
>--- a/Tools/Scripts/webkitpy/common/net/statusserver_mock.py
>+++ b/Tools/Scripts/webkitpy/common/net/statusserver_mock.py
>@@ -39,6 +39,7 @@ class MockStatusServer(object):
>         self.host = "example.com"
>         self.bot_id = bot_id
>         self._work_items = work_items or []
>+        self.use_https = True
> 
>     def patch_status(self, queue_name, patch_id):
>         return None
>diff --git a/Tools/Scripts/webkitpy/tool/commands/queues.py b/Tools/Scripts/webkitpy/tool/commands/queues.py
>index 0ebefa912cc2b4d54410c99f60e3c95241a6ff5f..2b33f980e9c60f0cd8063d4fcfb459a4dea56a3f 100644
>--- a/Tools/Scripts/webkitpy/tool/commands/queues.py
>+++ b/Tools/Scripts/webkitpy/tool/commands/queues.py
>@@ -90,6 +90,8 @@ class AbstractQueue(Command, QueueEngineDelegate):
>         # because our global option code looks for the first argument which does
>         # not begin with "-" and assumes that is the command name.
>         webkit_patch_args += ["--status-host=%s" % self._tool.status_server.host]
>+        if not self._tool.status_server.use_https:
>+            webkit_patch_args += ['--status-host-uses-http']
>         if self._tool.status_server.bot_id:
>             webkit_patch_args += ["--bot-id=%s" % self._tool.status_server.bot_id]
>         if self._options.port:

Actions: View | Formatted Diff | Diff

Attachments on bug 187061: 343631