Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[mixed-content] Resync WPT #14202

Merged
merged 1 commit into from
May 25, 2023
Merged

[mixed-content] Resync WPT #14202

merged 1 commit into from
May 25, 2023

Conversation

rreno
Copy link
Member

@rreno rreno commented May 22, 2023 •
edited by webkit-early-warning-system

2f01992

[mixed-content] Resync WPT
https://bugs.webkit.org/show_bug.cgi?id=257150
rdar://109676140

Reviewed by Tim Nguyen.

Resync mixed-content tests as of upstream commit
a4d663e6e09213bf599fb3a9dc66a52f2549c7fe

* LayoutTests/imported/w3c/web-platform-tests/mixed-content/csp.https.window-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/csp.https.window.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/csp.https.window.js: Added.
(promise_test):
(promise_test.async t):
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/csp.https.window.js.headers: Added.
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/nested-iframes.window-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/nested-iframes.window.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/nested-iframes.window.js: Added.
(onmessage):
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/resources/middle-frame.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/resources/w3c-import.log:
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html:
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/image-upgrade.https.sub-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/image-upgrade.https.sub.html:
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html:
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/w3c-import.log:
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/w3c-import.log:
* LayoutTests/platform/glib/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub-expected.txt:
* LayoutTests/platform/glib/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/image-upgrade.https.sub-expected.txt:
* LayoutTests/platform/glib/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub-expected.txt: Added.
* LayoutTests/platform/glib/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub-expected.txt:

Canonical link: https://commits.webkit.org/264495@main

3d232bb

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🧪 api-gtk
✅ 🛠 tv ❌ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge ✅ 🛠 watch
✅ 🛠 watch-sim

@rreno rreno self-assigned this May 22, 2023
@rreno rreno added the Page Loading For bugs in page loading, including handling of network callbacks. label May 22, 2023
@rreno rreno requested a review from brentfulgham May 22, 2023 20:57
@webkit-early-warning-system
Copy link
Collaborator

EWS run on previous version of this PR (hash 592cb26)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ❌ 🧪 wpe-wk2
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ❌ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-wk2-stress
✅ 🛠 watch
✅ 🛠 watch-sim

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 22, 2023
@rreno rreno removed the merging-blocked Applied to prevent a change from being merged label May 24, 2023
@rreno rreno force-pushed the eng/mixed-content-Resync-WPT branch from 592cb26 to 3d232bb Compare May 24, 2023 18:41
@webkit-early-warning-system
Copy link
Collaborator

EWS run on current version of this PR (hash 3d232bb)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🧪 api-gtk
✅ 🛠 tv ❌ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge ✅ 🛠 watch
✅ 🛠 watch-sim

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 25, 2023
@rreno
Copy link
Member Author

rreno commented May 25, 2023

Preexisting failure:
https://results.webkit.org/?suite=layout-tests&test=http/tests/workers/service/postmessage-after-terminating-hung-worker.html

@rreno rreno added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged labels May 25, 2023
@rreno
[mixed-content] Resync WPT
2f01992 
https://bugs.webkit.org/show_bug.cgi?id=257150
rdar://109676140

Reviewed by Tim Nguyen.

Resync mixed-content tests as of upstream commit
a4d663e

* LayoutTests/imported/w3c/web-platform-tests/mixed-content/csp.https.window-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/csp.https.window.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/csp.https.window.js: Added.
(promise_test):
(promise_test.async t):
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/csp.https.window.js.headers: Added.
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/nested-iframes.window-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/nested-iframes.window.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/nested-iframes.window.js: Added.
(onmessage):
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/resources/middle-frame.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/resources/w3c-import.log:
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html:
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/image-upgrade.https.sub-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/image-upgrade.https.sub.html:
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html:
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/w3c-import.log:
* LayoutTests/imported/w3c/web-platform-tests/mixed-content/w3c-import.log:
* LayoutTests/platform/glib/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub-expected.txt:
* LayoutTests/platform/glib/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/image-upgrade.https.sub-expected.txt:
* LayoutTests/platform/glib/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub-expected.txt: Added.
* LayoutTests/platform/glib/imported/w3c/web-platform-tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub-expected.txt:

Canonical link: https://commits.webkit.org/264495@main
@webkit-commit-queue
Copy link
Collaborator

Committed 264495@main (2f01992): https://commits.webkit.org/264495@main

Reviewed commits have been landed. Closing PR #14202 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 2f01992 into WebKit:main May 25, 2023
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label May 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nt1m nt1m nt1m approved these changes

@brentfulgham brentfulgham Awaiting requested review from brentfulgham

Assignees

@rreno rreno

Labels
Page Loading For bugs in page loading, including handling of network callbacks.
Projects
None yet
Milestone
No milestone
5 participants
@rreno @webkit-early-warning-system @webkit-commit-queue @nt1m @webkit-ews-buildbot