Skip to content

Commit

Permalink
Further migrate some scripts in WPT workers/module from domains[www1]…
Browse files Browse the repository at this point in the history
… to hosts[alt][]

https://bugs.webkit.org/show_bug.cgi?id=260901
rdar://114696293

Reviewed by Tim Nguyen.

This allows properly running the tests in Cocoa test infrastructure as they would pass from wpt.live.
We remove some GTK/WPE test expectations since they are now the same as the global ones.

* LayoutTests/imported/w3c/web-platform-tests/workers/modules/dedicated-worker-import-blob-url.any-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/workers/modules/dedicated-worker-import-blob-url.any.worker-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/workers/modules/dedicated-worker-import.any-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/workers/modules/dedicated-worker-import.any.worker-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/workers/modules/resources/dynamic-import-remote-origin-credentials-checker-worker.sub.js:
* LayoutTests/imported/w3c/web-platform-tests/workers/modules/resources/dynamic-import-remote-origin-script-worker.sub.js:
* LayoutTests/imported/w3c/web-platform-tests/workers/modules/resources/static-import-remote-origin-credentials-checker-worker.sub.js:
* LayoutTests/imported/w3c/web-platform-tests/workers/modules/resources/static-import-remote-origin-script-worker.sub.js:
* LayoutTests/imported/w3c/web-platform-tests/workers/modules/shared-worker-import.window-expected.txt:
* LayoutTests/platform/glib/imported/w3c/web-platform-tests/workers/modules/dedicated-worker-import-blob-url.any-expected.txt: Removed.
* LayoutTests/platform/glib/imported/w3c/web-platform-tests/workers/modules/dedicated-worker-import-blob-url.any.worker-expected.txt: Removed.
* LayoutTests/platform/glib/imported/w3c/web-platform-tests/workers/modules/dedicated-worker-import.any-expected.txt: Removed.
* LayoutTests/platform/glib/imported/w3c/web-platform-tests/workers/modules/dedicated-worker-import.any.worker-expected.txt: Removed.
* LayoutTests/platform/gtk/imported/w3c/web-platform-tests/workers/modules/shared-worker-import-blob-url.window-expected.txt: Removed.
* LayoutTests/platform/gtk/imported/w3c/web-platform-tests/workers/modules/shared-worker-import.window-expected.txt: Removed.
* LayoutTests/platform/wpe/imported/w3c/web-platform-tests/workers/modules/shared-worker-import-blob-url.window-expected.txt: Removed.
* LayoutTests/platform/wpe/imported/w3c/web-platform-tests/workers/modules/shared-worker-import.window-expected.txt: Removed.

Canonical link: https://commits.webkit.org/267499@main
  • Loading branch information
youennf committed Aug 31, 2023
1 parent 94fe30e commit 9ea25d9
Show file tree
Hide file tree
Showing 17 changed files with 7 additions and 104 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-on-load-script.py
CONSOLE MESSAGE: Importing a module script failed.

Harness Error (FAIL), message = Script error.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-on-load-script.py

Harness Error (FAIL), message = Error in remote: Importing a module script failed.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-on-load-script.py
CONSOLE MESSAGE: Importing a module script failed.

Harness Error (FAIL), message = Script error.

PASS Static import.
FAIL Static import (cross-origin). promise_test: Unhandled rejection with value: "Importing a module script failed."
FAIL Static import (cross-origin). promise_test: Unhandled rejection with value: "unknown error"
PASS Static import (redirect).
PASS Nested static import.
PASS Static import and then dynamic import.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-on-load-script.py

Harness Error (FAIL), message = Error in remote: Importing a module script failed.

PASS Static import.
FAIL Static import (cross-origin). promise_test: Unhandled rejection with value: "Importing a module script failed."
FAIL Static import (cross-origin). promise_test: Unhandled rejection with value: "unknown error"
PASS Static import (redirect).
PASS Nested static import.
PASS Static import and then dynamic import.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Import a remote origin script.
const import_url =
'http://{{domains[www1]}}:{{ports[http][0]}}/workers/modules/resources/export-credentials.py';
'http://{{hosts[alt][0]}}:{{ports[http][0]}}/workers/modules/resources/export-credentials.py';
if ('DedicatedWorkerGlobalScope' in self &&
self instanceof DedicatedWorkerGlobalScope) {
import(import_url)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Import a remote origin script.
const importUrl =
'https://{{domains[www1]}}:{{ports[https][0]}}/workers/modules/resources/export-on-load-script.js';
'https://{{hosts[alt][]}}:{{ports[https][0]}}/workers/modules/resources/export-on-load-script.js';
if ('DedicatedWorkerGlobalScope' in self &&
self instanceof DedicatedWorkerGlobalScope) {
import(importUrl)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Import a remote origin script.
import * as module from 'http://{{domains[www1]}}:{{ports[http][0]}}/workers/modules/resources/export-credentials.py';
import * as module from 'http://{{hosts[alt][0]}}:{{ports[http][0]}}/workers/modules/resources/export-credentials.py';
if ('DedicatedWorkerGlobalScope' in self &&
self instanceof DedicatedWorkerGlobalScope) {
postMessage(module.cookie);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Import a remote origin script.
import * as module from 'https://{{domains[www1]}}:{{ports[https][0]}}/workers/modules/resources/export-on-load-script.py';
import * as module from 'https://{{hosts[alt][0]}}:{{ports[https][0]}}/workers/modules/resources/export-on-load-script.py';
if ('DedicatedWorkerGlobalScope' in self &&
self instanceof DedicatedWorkerGlobalScope) {
self.onmessage = e => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

PASS Static import.
FAIL Static import (cross-origin). promise_test: Unhandled rejection with value: "Importing a module script failed."
FAIL Static import (cross-origin). promise_test: Unhandled rejection with value: "unknown error"
PASS Static import (redirect).
PASS Nested static import.
PASS Static import and then dynamic import.
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 9ea25d9

Please sign in to comment.