third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py - Issue 2454323004: Make layout test harness extensible with custom layout tests directory

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/port/port_testcase.py

Issue 2454323004: Make layout test harness extensible with custom layout tests directory (Closed)

Patch Set: Undo non test harness changes Created 4 years, 1 month 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

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py

index 7839adcc90ab17e142019a2a6a3aa885d73b1fc2..7817ab204bff9a011f1f812b4ed0a2bc3b4b6fe9 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py

@@ -361,7 +361,7 @@ class PortTestCase(unittest.TestCase):

del port.host.environ['WEBKIT_HTTP_SERVER_CONF_PATH']

self.assertEqual(

port.path_to_apache_config_file(),

- port.host.filesystem.join(port.layout_tests_dir(), 'http/conf/httpd.conf'))

+ port.host.filesystem.join(port.apache_config_directory(), 'httpd.conf'))

# Check that even if we mock out _apache_config_file_name, the environment variable takes precedence.

port.host.environ['WEBKIT_HTTP_SERVER_CONF_PATH'] = '/existing/httpd.conf'