Attachment 273730 Details for Bug 141157 – Rebasing test expectations

[patch] Rebasing test expectations

bug-141157-20160311165436.patch (text/plain), 10.05 KB, created by youenn fablet on 2016-03-11 07:54:50 PST

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2016-03-11 07:54:50 PST

Size: 10.05 KB

patch

obsolete

>Subversion Revision: 198003
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index d745f22a3f92774afa67ece41e1b426cec1e9288..a720afb0f25d836d0a77835d39427f8979a33183 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2016-03-11  Youenn Fablet  <youenn.fablet@crf.canon.fr>
>+
>+        Web platform test server should not try to launch servers on already bound sockets
>+        https://bugs.webkit.org/show_bug.cgi?id=141157
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
>+        (wpt_config_json): Load WPT config from LayoutTests/imported/w3c/resources/config.json.
>+        (base_url): Refactored to use wpt_config_json routine.
>+        (WebPlatformTestServer.__init__): Fill port mappings according WPT config.
>+
> 2016-03-10  Simon Fraser  <simon.fraser@apple.com>
> 
>         Font antialiasing (smoothing) changes when elements are rendered into compositing layers
>diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py b/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py
>index ccb493166be7d493cae938f920a6f4a90605f67a..51c95bb290d698f62f2e063446d2703dd03bc087 100755
>--- a/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py
>+++ b/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py
>@@ -39,14 +39,20 @@ def doc_root(port_obj):
>     return doc_root
> 
> 
>-def base_url(port_obj):
>+def wpt_config_json(port_obj):
>     config_wk_filepath = port_obj._filesystem.join(port_obj.layout_tests_dir(), "imported", "w3c", "resources", "config.json")
>     if not port_obj.host.filesystem.isfile(config_wk_filepath):
>+        return
>+    json_data = port_obj._filesystem.read_text_file(config_wk_filepath)
>+    return json.loads(json_data)
>+
>+
>+def base_url(port_obj):
>+    config = wpt_config_json(port_obj)
>+    if not config:
>         # This should only be hit by webkitpy unit tests
>         _log.debug("No WPT config file found")
>         return "http://localhost:8800/"
>-    json_data = port_obj._filesystem.read_text_file(config_wk_filepath)
>-    config = json.loads(json_data)
>     ports = config["ports"]
>     return "http://" + config["host"] + ":" + str(ports["http"][0]) + "/"
> 
>@@ -78,6 +84,17 @@ class WebPlatformTestServer(http_server_base.HttpServerBase):
>         self._start_cmd = ["python", self._filesystem.join(current_dir_path, "web_platform_test_launcher.py"), self._servers_file]
>         self._doc_root_path = self._filesystem.join(self._layout_root, self._doc_root)
> 
>+        self._mappings = []
>+        config = wpt_config_json(port_obj)
>+        if config:
>+            ports = config["ports"]
>+            for key in ports:
>+                for value in ports[key]:
>+                    port = {"port": value}
>+                    if key == "https":
>+                        port["sslcert"] = True
>+                    self._mappings.append(port)
>+
>     def _install_modules(self):
>         modules_file_path = self._filesystem.join(self._doc_root_path, "..", "resources", "web-platform-tests-modules.json")
>         if not self._filesystem.isfile(modules_file_path):
>diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
>index ede0e19ca1a61731b74a361513071b4d416488d7..77919634b56d12cdf16b2df23d7054846e084a7b 100644
>--- a/LayoutTests/imported/w3c/ChangeLog
>+++ b/LayoutTests/imported/w3c/ChangeLog
>@@ -1,3 +1,16 @@
>+2016-03-11  Youenn Fablet  <youenn.fablet@crf.canon.fr>
>+
>+        Web platform test server should not try to launch servers on already bound sockets
>+        https://bugs.webkit.org/show_bug.cgi?id=141157
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * resources/config.json: Changed wpt https port from 8443 to 9443.
>+        * web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt: Updated according https port change. 
>+        * web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt: Ditto.
>+        * web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt: Ditto.
>+        * web-platform-tests/fetch/api/basic/mode-same-origin-worker-expected.txt: Ditto.
>+
> 2016-03-09  Chris Dumez  <cdumez@apple.com>
> 
>         focus() / blur() should be on HTMLElement / SVGElement, not Element
>diff --git a/LayoutTests/imported/w3c/resources/config.json b/LayoutTests/imported/w3c/resources/config.json
>index 2678782aa02a2067893c330405811ed170538901..3de1b9642529d65b3d7fca53e9ed541e4c274a5c 100644
>--- a/LayoutTests/imported/w3c/resources/config.json
>+++ b/LayoutTests/imported/w3c/resources/config.json
>@@ -1,6 +1,6 @@
> {"host": "localhost",
>  "ports":{"http":[8800, 8801],
>-          "https":[8443],
>+          "https":[9443],
>           "ws":[49001]},
>  "check_subdomains": false,
>  "log_level":"debug",
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt
>index 4afcc5cee2f387891e1199eb949492cc071d1bd7..d150a738c402270ec67cc77a68b671dfc870f3cd 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt
>@@ -1,6 +1,6 @@
> 
> FAIL Fetch ../resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
> FAIL Fetch http://localhost:8800/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
>-FAIL Fetch https://localhost:8443/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
>+FAIL Fetch https://localhost:9443/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
> FAIL Fetch http://www.localhost:8800/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt
>index 4afcc5cee2f387891e1199eb949492cc071d1bd7..d150a738c402270ec67cc77a68b671dfc870f3cd 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-worker-expected.txt
>@@ -1,6 +1,6 @@
> 
> FAIL Fetch ../resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
> FAIL Fetch http://localhost:8800/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
>-FAIL Fetch https://localhost:8443/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
>+FAIL Fetch https://localhost:9443/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
> FAIL Fetch http://www.localhost:8800/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt
>index 46907ec6c8cf6743e4fb58f6c1f83dc9d5aee6d4..9ac98691ab0f8633ad1f2743779c82929b77f07c 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt
>@@ -1,6 +1,6 @@
> 
> FAIL Fetch ../resources/top.txt with same-origin mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
> FAIL Fetch http://localhost:8800/fetch/api/resources/top.txt with same-origin mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
>-FAIL Fetch https://localhost:8443/fetch/api/resources/top.txt with same-origin mode assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
>+FAIL Fetch https://localhost:9443/fetch/api/resources/top.txt with same-origin mode assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
> FAIL Fetch http://www.localhost:8800/fetch/api/resources/top.txt with same-origin mode assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-worker-expected.txt
>index 46907ec6c8cf6743e4fb58f6c1f83dc9d5aee6d4..9ac98691ab0f8633ad1f2743779c82929b77f07c 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-worker-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-worker-expected.txt
>@@ -1,6 +1,6 @@
> 
> FAIL Fetch ../resources/top.txt with same-origin mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
> FAIL Fetch http://localhost:8800/fetch/api/resources/top.txt with same-origin mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
>-FAIL Fetch https://localhost:8443/fetch/api/resources/top.txt with same-origin mode assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
>+FAIL Fetch https://localhost:9443/fetch/api/resources/top.txt with same-origin mode assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
> FAIL Fetch http://www.localhost:8800/fetch/api/resources/top.txt with same-origin mode assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
>

Actions: View | Formatted Diff | Diff

Attachments on bug 141157: 247121 | 273724 | 273726 | 273727 | 273729 | 273730 | 273941 | 273948