Commit 994f5491 authored by danakj's avatar danakj Committed by Commit Bot

Make request-mixed-content-status-*.js web tests work in site isolation.

This puts the main frame and iframe into the same site so that the
devtools inspector can watch its network requests.

Also remove access-inspected-object.js from the not-site-per-process
virtual test suite since it was fixed and enabled. The test will be run
without site-isolation in the not_site_per_process_blink_web_tests bot
step.

R=yangguo@chromium.org

Bug: 623268
Change-Id: I1ab5fd22ec988e2aa7de8cea52e207a6f6c4528c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2218750
Commit-Queue: Yang Guo <yangguo@chromium.org>
Auto-Submit: danakj <danakj@chromium.org>
Reviewed-by: default avatarYang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772583}
parent d418c3f8
......@@ -346,9 +346,6 @@ crbug.com/874695 http/tests/fetch/workers/stream-reader.html [ Slow ]
crbug.com/874695 http/tests/fetch/workers/thorough/* [ Slow ]
crbug.com/874695 http/tests/images/png-progressive-load.html [ Slow ]
crbug.com/874695 http/tests/images/webp-progressive-load.html [ Slow ]
crbug.com/874695 http/tests/inspector-protocol/request-mixed-content-status-blockable.js [ Slow ]
crbug.com/874695 http/tests/inspector-protocol/request-mixed-content-status-none.js [ Slow ]
crbug.com/874695 http/tests/inspector-protocol/request-mixed-content-status-optionally-blockable.js [ Slow ]
crbug.com/874695 http/tests/media/controls/toggle-class-with-state-source-buffer.html [ Slow ]
crbug.com/874695 http/tests/media/preload-conditions.html [ Slow ]
crbug.com/874695 http/tests/media/video-buffered.html [ Slow ]
......
......@@ -100,9 +100,6 @@ crbug.com/1050826 external/wpt/mixed-content/gen/top.http-rp/opt-in/object-tag.h
# Tests temporarily disabled with Site Isolation - uninvestigated bugs:
# TODO(lukasza, alexmos): Burn down this list.
crbug.com/623268 http/tests/inspector-protocol/request-mixed-content-status-blockable.js [ Timeout ]
crbug.com/623268 http/tests/inspector-protocol/request-mixed-content-status-none.js [ Timeout ]
crbug.com/623268 http/tests/inspector-protocol/request-mixed-content-status-optionally-blockable.js [ Timeout ]
crbug.com/765779 http/tests/loading/bad-server-subframe.html [ Failure ]
crbug.com/801992 http/tests/misc/iframe-script-modify-attr.html [ Pass Crash ]
crbug.com/872952 http/tests/media/autoplay/document-user-activation-feature-policy-iframe-no-gesture.html [ Failure Pass Timeout ]
......
......@@ -475,11 +475,7 @@
"http/tests/dom/EventListener-incumbent-global-1.html",
"http/tests/dom/EventListener-incumbent-global-2.html",
"http/tests/images/image-decode-in-frame.html",
"http/tests/inspector-protocol/access-inspected-object.js",
"http/tests/inspector-protocol/network/navigation-blocking-xorigin-iframe.js",
"http/tests/inspector-protocol/request-mixed-content-status-blockable.js",
"http/tests/inspector-protocol/request-mixed-content-status-none.js",
"http/tests/inspector-protocol/request-mixed-content-status-optionally-blockable.js",
"http/tests/loading/bad-server-subframe.html",
"http/tests/media/autoplay/document-user-activation-feature-policy-iframe-no-gesture.html",
"http/tests/media/autoplay/webaudio-autoplay-iframe-with-gesture.html",
......
Tests that willSendRequest contains the correct mixed content status for active mixed content.
Network agent enabled
Mixed content type of https://127.0.0.1:8443/inspector-protocol/resources/active-mixed-content-iframe.html: none
Mixed content type of https://example.test:8443/inspector-protocol/resources/active-mixed-content-iframe.html: none
Mixed content type of http://example.test:8000/inspector-protocol/resources/blank.js: blockable
(async function(testRunner) {
var {page, session, dp} = await testRunner.startBlank(
const {page, session, dp} = await testRunner.startURL(
'https://example.test:8443/inspector-protocol/resources/test-page.html',
`Tests that willSendRequest contains the correct mixed content status for active mixed content.`);
// The iframe is in the same site so we can watch its network requests.
function addIframeWithMixedContent() {
var iframe = document.createElement('iframe');
iframe.src = 'https://127.0.0.1:8443/inspector-protocol/resources/active-mixed-content-iframe.html';
const iframe = document.createElement('iframe');
iframe.src = 'https://example.test:8443/inspector-protocol/resources/active-mixed-content-iframe.html';
document.body.appendChild(iframe);
}
var helper = await testRunner.loadScript('./resources/mixed-content-type-test.js');
const helper = await testRunner.loadScript('./resources/mixed-content-type-test.js');
helper(testRunner, session, addIframeWithMixedContent);
})
Tests that willSendRequest contains the correct mixed content status for not-mixed content.
Network agent enabled
Mixed content type of https://127.0.0.1:8443/inspector-protocol/resources/no-mixed-content-iframe.html: none
Mixed content type of https://127.0.0.1:8443/inspector-protocol/resources/blank.js: none
Mixed content type of https://example.test:8443/inspector-protocol/resources/no-mixed-content-iframe.html: none
Mixed content type of https://example.test:8443/inspector-protocol/resources/blank.js: none
(async function(testRunner) {
var {page, session, dp} = await testRunner.startBlank(
var {page, session, dp} = await testRunner.startURL(
'https://example.test:8443/inspector-protocol/resources/test-page.html',
`Tests that willSendRequest contains the correct mixed content status for not-mixed content.`);
// The iframe is in the same site so we can watch its network requests.
function addIframeWithMixedContent() {
var iframe = document.createElement('iframe');
iframe.src = 'https://127.0.0.1:8443/inspector-protocol/resources/no-mixed-content-iframe.html';
iframe.src = 'https://example.test:8443/inspector-protocol/resources/no-mixed-content-iframe.html';
document.body.appendChild(iframe);
}
......
Tests that willSendRequest contains the correct mixed content status for passive mixed content.
Network agent enabled
Mixed content type of https://127.0.0.1:8443/inspector-protocol/resources/passive-mixed-content-iframe.html: none
Mixed content type of https://example.test:8443/inspector-protocol/resources/passive-mixed-content-iframe.html: none
Mixed content type of http://example.test:8000/resources/square.png: optionally-blockable
(async function(testRunner) {
var {page, session, dp} = await testRunner.startBlank(
var {page, session, dp} = await testRunner.startURL(
'https://example.test:8443/inspector-protocol/resources/test-page.html',
`Tests that willSendRequest contains the correct mixed content status for passive mixed content.`);
// The iframe is in the same site so we can watch its network requests.
function addIframeWithMixedContent() {
var iframe = document.createElement('iframe');
iframe.src = 'https://127.0.0.1:8443/inspector-protocol/resources/passive-mixed-content-iframe.html';
iframe.src = 'https://example.test:8443/inspector-protocol/resources/passive-mixed-content-iframe.html';
document.body.appendChild(iframe);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment