Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(541)

Unified Diff: Tools/Scripts/webkitpy/layout_tests/port/driver.py

Issue 657353002: Mixed Content: Re-allow non-webby URLs in IFrames. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Tools/Scripts/webkitpy/layout_tests/port/driver.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/driver.py b/Tools/Scripts/webkitpy/layout_tests/port/driver.py
index f140f6751bf2795f785922cd3b98e2ed47543dc6..bddd09c42c21b649a19207beaf581149dcded7da 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/driver.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/driver.py
@@ -230,15 +230,16 @@ class Driver(object):
"""Convert a test name to a URI.
Tests which have an 'https' directory in their paths (e.g.
- '/http/tests/security/mixedContent/https/test1.html') will be loaded
- over HTTPS; all other tests over HTTP.
+ '/http/tests/security/mixedContent/https/test1.html') or '.https.' in
+ their name (e.g. 'http/tests/security/mixedContent/test1.https.html') will
+ be loaded over HTTPS; all other tests over HTTP.
"""
if not self.is_http_test(test_name):
return path.abspath_to_uri(self._port.host.platform, self._port.abspath_for_test(test_name))
relative_path = test_name[len(self.HTTP_DIR):]
- if "/https/" in test_name:
+ if "/https/" in test_name or ".https." in test_name:
return "https://127.0.0.1:8443/" + relative_path
return "http://127.0.0.1:8000/" + relative_path
« no previous file with comments | « Source/core/loader/MixedContentChecker.cpp ('k') | Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698