third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py - Issue 1948033003: Convert most geolocation layout tests to use a JS mock implementation.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py

Issue 1948033003: Convert most geolocation layout tests to use a JS mock implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission-disconnect

Patch Set: Created 4 years, 7 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

« third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/TEMPLATE.html ('K') | « third_party/WebKit/LayoutTests/http/tests/security/powerfulFeatureRestrictions/resources/geolocation.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py

index 59b676cd4e0a62e097e1e909b6105e833d4410a3..f7956e9e0e66089be69333c9fe4f8d7ece79c31c 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py

@@ -76,7 +76,7 @@ class ApacheHTTP(server_base.ServerBase):

'-f', '%s' % self._port_obj.path_to_apache_config_file(),

'-C', 'ServerRoot "%s"' % server_root,

'-C', 'DocumentRoot "%s"' % document_root,

- '-c', 'Alias /js-test-resources "%s"' % js_test_resources_dir,

+ '-c', 'AliasMatch /(.*/)?js-test-resources/(.+) "%s/$1resources/$2"' % test_dir,

Dirk Pranke 2016/05/10 20:51:49 why was this change needed, and what did it do?

Sam McNally 2016/05/11 00:40:41 The existing /js-test-resources allows http layout

'-c', 'AliasMatch ^/resources/testharness([r.].*) "%s/testharness$1"' % imported_resources_dir,

'-c', 'Alias /w3c/resources/WebIDLParser.js "%s/webidl2/lib/webidl2.js"' % imported_resources_dir,

'-c', 'Alias /w3c/resources "%s"' % imported_resources_dir,