Attachment 371386 Details for Bug 188640 – Patch

[patch] Patch

bug-188640-20190605143240.patch (text/plain), 7.49 KB, created by Alexey Shvayka on 2019-06-05 04:32:42 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Shvayka

Created: 2019-06-05 04:32:42 PDT

Size: 7.49 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 246103)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2019-06-05  Alexey Shvayka  <shvaikalesh@gmail.com>
>+
>+        [win-ews] No such file or directory: u'/cygdrive/C/cygwin/home/buildbot/WebKit/WebKitBuild/Release/bin32/layout-test-results/pywebsocket.ws.log-out.txt'
>+        https://bugs.webkit.org/show_bug.cgi?id=188640
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        1. Properly shutdown WebSocket server so that port 8880 is released.
>+        2. Prevent failure of WebSocket tests when launched in freshly cloned repository.
>+
>+        * Scripts/new-run-webkit-websocketserver:
>+        (main): Tweak import and use class constants of PyWebSocket directly.
>+        * Scripts/webkitpy/layout_tests/servers/websocket_server.py:
>+        (PyWebSocket._prepare_config): Create test output directory if it doesn't exist.
>+
> 2019-06-01  Antoine Quint  <graouts@apple.com>
> 
>         [Pointer Events] Add support for chorded button interactions
>Index: Tools/Scripts/new-run-webkit-websocketserver
>===================================================================
>--- Tools/Scripts/new-run-webkit-websocketserver	(revision 246067)
>+++ Tools/Scripts/new-run-webkit-websocketserver	(working copy)
>@@ -35,7 +35,7 @@ import optparse
> import tempfile
> 
> from webkitpy.common.host import Host
>-from webkitpy.layout_tests.servers import websocket_server
>+from webkitpy.layout_tests.servers.websocket_server import PyWebSocket
> from webkitpy.port import platform_options
> 
> 
>@@ -81,11 +81,9 @@ def main():
> 
>     if not options.port:
>         if options.use_tls:
>-            # FIXME: We shouldn't grab at this private variable.
>-            options.port = websocket_server._DEFAULT_WSS_PORT
>+            options.port = PyWebSocket.DEFAULT_WSS_PORT
>         else:
>-            # FIXME: We shouldn't grab at this private variable.
>-            options.port = websocket_server._DEFAULT_WS_PORT
>+            options.port = PyWebSocket.DEFAULT_WS_PORT
> 
>     if not options.output_dir:
>         options.output_dir = tempfile.gettempdir()
>@@ -104,7 +102,7 @@ def main():
> 
>     host = Host()
>     port_obj = host.port_factory.get(options.platform, options=options)
>-    pywebsocket = websocket_server.PyWebSocket(port_obj, options.output_dir, **kwds)
>+    pywebsocket = PyWebSocket(port_obj, options.output_dir, **kwds)
> 
>     log_level = logging.WARN
>     if options.verbose:
>Index: Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py
>===================================================================
>--- Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py	(revision 246067)
>+++ Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py	(working copy)
>@@ -109,6 +109,7 @@ class PyWebSocket(http_server.Lighttpd):
>         return [self._port]
> 
>     def _prepare_config(self):
>+        self._filesystem.maybe_make_directory(self._output_dir)
>         log_file_name = self._log_prefix
>         # FIXME: Doesn't Executive have a devnull, so that we don't have to use os.devnull directly?
>         self._wsin = open(os.devnull, 'r')
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 246067)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2019-06-05  Alexey Shvayka  <shvaikalesh@gmail.com>
>+
>+        [win-ews] No such file or directory: u'/cygdrive/C/cygwin/home/buildbot/WebKit/WebKitBuild/Release/bin32/layout-test-results/pywebsocket.ws.log-out.txt'
>+        https://bugs.webkit.org/show_bug.cgi?id=188640
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        WebSocket server is now fixed, tests should pass. 
>+
>+        Reverted changeset:
>+
>+        "Unreviewed test gardening"
>+        https://bugs.webkit.org/show_bug.cgi?id=188640
>+        https://trac.webkit.org/changeset/234933
>+
> 2019-06-04  Antoine Quint  <graouts@apple.com>
> 
>         The "mouseenter" and "pointerenter" events are fired from the bottom up
>Index: LayoutTests/platform/win/TestExpectations
>===================================================================
>--- LayoutTests/platform/win/TestExpectations	(revision 246067)
>+++ LayoutTests/platform/win/TestExpectations	(working copy)
>@@ -3149,6 +3149,7 @@ http/tests/security/isolatedWorld/number
> http/tests/security/local-video-src-from-remote.html [ Failure Pass Crash ]
> http/tests/security/video-cross-origin-caching.html [ Crash Failure Timeout Pass ]
> http/tests/security/video-poster-cross-origin-crash2.html [ Crash Failure Pass ]
>+http/tests/websocket/tests/hybi/simple-wss.html [ Crash Timeout ]
> security/contentSecurityPolicy/worker-inherits-blocks-eval.html [ Failure Pass ]
> storage/indexeddb/database-close-private.html [ Failure Pass ]
> security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html [ ImageOnlyFailure Pass Crash ]
>@@ -3676,6 +3677,7 @@ http/tests/preload/single_download_prelo
> http/tests/security/contentSecurityPolicy/audio-redirect-allowed.html [ Crash Timeout Pass ]
> http/tests/security/contentSecurityPolicy/audio-redirect-blocked.html [ Timeout Failure Crash ]
> http/tests/security/contentSecurityPolicy/block-favicon.html [ Failure Pass ]
>+http/tests/websocket/tests/hybi/workers/close-code-and-reason.html [ Crash Pass ]
> svg/animations/animations-paused-in-background-page.html [ Timeout Pass ]
> 
> # FIXME: create bugs to track the following failures:
>@@ -3815,6 +3817,8 @@ webkit.org/b/176423 editing/pasteboard/e
> 
> webkit.org/b/176598 http/tests/security/contentSecurityPolicy/audio-redirect-allowed2.html [ Pass Crash ]
> webkit.org/b/176606 http/tests/preload/single_download_preload_headers.php [ Pass Crash ]
>+webkit.org/b/176609 http/tests/websocket/tests/hybi/close-code-and-reason.html [ Pass Crash ]
>+webkit.org/b/176632 http/tests/websocket/tests/hybi/websocket-pending-activity.html [ Pass Crash ]
> 
> # Web platform tests are very slow on Windows.
> webkit.org/b/176657 imported/w3c/web-platform-tests/ [ Skip ]
>@@ -3831,6 +3835,8 @@ webkit.org/b/176998 storage/indexeddb/mo
> 
> webkit.org/b/177071 fast/events/beforeunload-dom-manipulation-crash.html [ Crash ]
> 
>+webkit.org/b/177072 http/tests/websocket/tests/hybi/secure-cookie-secure-connection.pl [ Failure ]
>+
> webkit.org/b/177109 fast/css/display-contents-style-update.html [ ImageOnlyFailure ]
> 
> webkit.org/b/177212 accessibility/crash-table-recursive-layout.html [ Failure ]
>@@ -3998,6 +4004,8 @@ webkit.org/b/183955 accessibility/row-wi
> webkit.org/b/184133 transitions/opacity-transition-zindex.html [ Skip ]
> webkit.org/b/184133 legacy-animation-engine/transitions/opacity-transition-zindex.html [ Skip ]
> 
>+webkit.org/b/184134 http/tests/websocket/tests/hybi/websocket-cookie-overwrite-behavior.html [ Failure ]
>+
> webkit.org/b/184482 legacy-animation-engine/compositing/animation/animation-backing.html [ Failure ]
> webkit.org/b/184482 legacy-animation-engine/compositing/animation/animation-compositing.html [ Failure ]
> webkit.org/b/184482 legacy-animation-engine/compositing/backing/backface-visibility-flip.html [ Failure ]
>@@ -4103,11 +4111,6 @@ webkit.org/b/188169 http/tests/security/
> 
> webkit.org/b/188600 editing/input/press-tab-during-ime-composition.html [ Failure ]
> 
>-http/tests/websocket [ Skip ]
>-http/tests/security/mixedContent/websocket [ Skip ]
>-imported/blink/http/tests/websocket [ Skip ]
>-imported/blink/http/tests/security/mixedContent/websocket [ Skip ]
>-
> # Feature flag only enabled for wk2
> css-custom-properties-api [ Skip ]
> fast/css-custom-paint [ Skip ]

Actions: View | Formatted Diff | Diff

Attachments on bug 188640: 371206 | 371213 | 371232 | 371355 | 371360 | 371386 | 371399 | 371402 | 371443 | 371453 | 371470 | 371505 | 371508 | 379883