Changeset 250593 in webkit


Ignore:
Timestamp:
Oct 1, 2019 8:45:39 PM (5 years ago)
Author:
commit-queue@webkit.org
Message:

[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

Patch by Alexey Shvayka <Alexey Shvayka> on 2019-10-01
Reviewed by Alex Christensen.

Tools:

  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.

LayoutTests:

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

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r250589 r250593  
     12019-10-01  Alexey Shvayka  <shvaikalesh@gmail.com>
     2
     3        [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'
     4        https://bugs.webkit.org/show_bug.cgi?id=188640
     5
     6        Reviewed by Alex Christensen.
     7
     8        WebSocket server is now fixed, tests should pass.
     9
     10        Reverted changeset:
     11
     12        "Unreviewed test gardening"
     13        https://bugs.webkit.org/show_bug.cgi?id=188640
     14        https://trac.webkit.org/changeset/234933
     15
    1162019-10-01  John Wilander  <wilander@apple.com>
    217

  • trunk/LayoutTests/platform/win/TestExpectations

    r250413 r250593  
    31753175http/tests/security/video-cross-origin-caching.html [ Crash Failure Timeout Pass ]
    31763176http/tests/security/video-poster-cross-origin-crash2.html [ Crash Failure Pass ]
     3177http/tests/websocket/tests/hybi/deflate-frame-parameter.html [ Failure ]
    31773178security/contentSecurityPolicy/worker-inherits-blocks-eval.html [ Failure Pass ]
    31783179storage/indexeddb/database-close-private.html [ Failure Pass ]
    … …  
    37023703http/tests/security/contentSecurityPolicy/audio-redirect-blocked.html [ Timeout Failure Crash ]
    37033704http/tests/security/contentSecurityPolicy/block-favicon.html [ Failure Pass ]
     3705http/tests/websocket/tests/hybi/workers/close-code-and-reason.html [ Crash Pass ]
    37043706svg/animations/animations-paused-in-background-page.html [ Timeout Pass ]
    37053707
    … …  
    38503852webkit.org/b/176598 http/tests/security/contentSecurityPolicy/audio-redirect-allowed2.html [ Pass Crash ]
    38513853webkit.org/b/176606 http/tests/preload/single_download_preload_headers.php [ Pass Crash ]
     3854webkit.org/b/176609 http/tests/websocket/tests/hybi/close-code-and-reason.html [ Pass Crash ]
     3855webkit.org/b/176632 http/tests/websocket/tests/hybi/websocket-pending-activity.html [ Pass Crash ]
    38523856
    38533857# Web platform tests are very slow on Windows.
    … …  
    38653869
    38663870webkit.org/b/177071 fast/events/beforeunload-dom-manipulation-crash.html [ Crash ]
     3871
     3872webkit.org/b/177072 http/tests/websocket/tests/hybi/secure-cookie-secure-connection.pl [ Failure ]
    38673873
    38683874webkit.org/b/177109 fast/css/display-contents-style-update.html [ ImageOnlyFailure ]
    … …  
    40324038webkit.org/b/184133 legacy-animation-engine/transitions/opacity-transition-zindex.html [ Skip ]
    40334039
     4040webkit.org/b/187762 http/tests/websocket/tests/hybi/websocket-allowed-setting-cookie-as-third-party.html [ Pass ]
     4041webkit.org/b/187762 http/tests/websocket/tests/hybi/websocket-cookie-overwrite-behavior.html [ Pass Failure ]
     4042
    40344043webkit.org/b/184482 legacy-animation-engine/compositing/animation/animation-backing.html [ Failure ]
    40354044webkit.org/b/184482 legacy-animation-engine/compositing/animation/animation-compositing.html [ Failure ]
    … …  
    41374146webkit.org/b/188600 editing/input/press-tab-during-ime-composition.html [ Failure ]
    41384147
    4139 http/tests/security/mixedContent/websocket [ Skip ]
    4140 http/tests/websocket [ Skip ]
    4141 imported/blink/http/tests/security/mixedContent/websocket [ Skip ]
    4142 imported/blink/http/tests/websocket [ Skip ]
    41434148imported/w3c/web-platform-tests/content-security-policy/connect-src/connect-src-websocket-allowed.sub.html [ Skip ]
    41444149imported/w3c/web-platform-tests/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html [ Skip ]

  • trunk/Tools/ChangeLog

    r250591 r250593  
     12019-10-01  Alexey Shvayka  <shvaikalesh@gmail.com>
     2
     3        [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'
     4        https://bugs.webkit.org/show_bug.cgi?id=188640
     5
     6        Reviewed by Alex Christensen.
     7
     8        1. Properly shutdown WebSocket server so that port 8880 is released.
     9        2. Prevent failure of WebSocket tests when launched in freshly cloned repository.
     10
     11        * Scripts/new-run-webkit-websocketserver:
     12        (main): Tweak import and use class constants of PyWebSocket directly.
     13        * Scripts/webkitpy/layout_tests/servers/websocket_server.py:
     14        (PyWebSocket._prepare_config): Create test output directory if it doesn't exist.
     15
    1162019-10-01  Alex Christensen  <achristensen@webkit.org>
    217

  • trunk/Tools/Scripts/new-run-webkit-websocketserver

    r149757 r250593  
    3636
    3737from webkitpy.common.host import Host
    38 from webkitpy.layout_tests.servers import websocket_server
     38from webkitpy.layout_tests.servers.websocket_server import PyWebSocket
    3939from webkitpy.port import platform_options
    4040
    … …  
    8282    if not options.port:
    8383        if options.use_tls:
    84             # FIXME: We shouldn't grab at this private variable.
    85             options.port = websocket_server._DEFAULT_WSS_PORT
     84            options.port = PyWebSocket.DEFAULT_WSS_PORT
    8685        else:
    87             # FIXME: We shouldn't grab at this private variable.
    88             options.port = websocket_server._DEFAULT_WS_PORT
     86            options.port = PyWebSocket.DEFAULT_WS_PORT
    8987
    9088    if not options.output_dir:
    … …  
    105103    host = Host()
    106104    port_obj = host.port_factory.get(options.platform, options=options)
    107     pywebsocket = websocket_server.PyWebSocket(port_obj, options.output_dir, **kwds)
     105    pywebsocket = PyWebSocket(port_obj, options.output_dir, **kwds)
    108106
    109107    log_level = logging.WARN

  • trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py

    r247640 r250593  
    110110
    111111    def _prepare_config(self):
     112        self._filesystem.maybe_make_directory(self._output_dir)
    112113        log_file_name = self._log_prefix
    113114        # FIXME: Doesn't Executive have a devnull, so that we don't have to use os.devnull directly?
Note: See TracChangeset for help on using the changeset viewer.