Commit 30e74bc1 authored by Tim Volodine's avatar Tim Volodine
Browse files

Fix broken CTS test: WebSettingsTest#testAllowMixedMode

MERGE to lollipop-mr1-cts-dev.

Due to a change in chromium [1] the "localhost" addresses
cannot be treated as mixed content anymore and since the
test webservers use "localhost" the test is broken.

This patch fixes the issue by using a combination of a ssl
webserver and a custom shouldInterceptRequest implementation
to intercept requests to insecure url addresses. In particular
the ssl webserver attempts to load insecure resources
(javascript file or an image) and depending on the mixed content
settings in webview these requests are either allowed or not.
This is reflected in the calls to shouldInterceptRequest.

[1] https://chromium-review.googlesource.com/702277

BUG: 71992132,68877177
Test: cts-tradefed run cts -m CtsWebkitTestCases --test android.webkit.cts.WebSettingsTest#testAllowMixedMode

Change-Id: I28119fd0f7a7e9c97212f3e1d9c2c6cb57ac2fa6
parent f2c78449
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment