third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py - Issue 1783073002: Run auto-formatter on files in webkitpy/layout_tests/.

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 1783073002: Run auto-formatter on files in webkitpy/layout_tests/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_unittest.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/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 6fe127dd6d468de10a0cfa82b537b3d50c92f027..134880bc247d2d7d590e40a0bd950938c0edbbeb 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

@@ -39,6 +39,7 @@ _log = logging.getLogger(__name__)

class ApacheHTTP(server_base.ServerBase):

def __init__(self, port_obj, output_dir, additional_dirs, number_of_servers):

super(ApacheHTTP, self).__init__(port_obj, output_dir)

# We use the name "httpd" instead of "apache" to make our paths (e.g. the pid file: /tmp/WebKit/httpd.pid)

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

'-c', 'PidFile %s' % self._pid_file,

'-c', 'SSLCertificateFile "%s"' % cert_file,

'-c', 'Alias /inspector-sources "%s"' % inspector_sources_dir,

- ]

+ ]

if self._is_win:

start_cmd += ['-c', "ThreadsPerChild %d" % (self._number_of_servers * 8)]

@@ -122,10 +123,10 @@ class ApacheHTTP(server_base.ServerBase):

self._start_cmd = start_cmd

for alias, path in additional_dirs.iteritems():

start_cmd += ['-c', 'Alias %s "%s"' % (alias, path),

- # Disable CGI handler for additional dirs.

- '-c', '<Location %s>' % alias,

- '-c', 'RemoveHandler .cgi .pl',

- '-c', '</Location>']

+ # Disable CGI handler for additional dirs.

+ '-c', '<Location %s>' % alias,

+ '-c', 'RemoveHandler .cgi .pl',

+ '-c', '</Location>']

self._start_cmd = start_cmd