Tools/Scripts/webkitpy/layout_tests/port/base.py - Issue 327423008: Change port to use apache by default on win7, update test expectations.

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: Tools/Scripts/webkitpy/layout_tests/port/base.py

Issue 327423008: Change port to use apache by default on win7, update test expectations. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: merge forward to r177025 Created 6 years, 6 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 | « LayoutTests/platform/win/http/tests/xmlhttprequest/xmlhttprequest-setrequestheader-no-value-expected.txt ('k') | Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Tools/Scripts/webkitpy/layout_tests/port/base.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/base.py b/Tools/Scripts/webkitpy/layout_tests/port/base.py

index 7a71a3c52f35101aa9878f4b4e70be67ec116bb9..3c3004d975452175f8f71dece61b4b49846509db 100644

--- a/Tools/Scripts/webkitpy/layout_tests/port/base.py

+++ b/Tools/Scripts/webkitpy/layout_tests/port/base.py

@@ -1127,7 +1127,7 @@ class Port(object):

def http_server_supports_ipv6(self):

# Apache < 2.4 on win32 does not support IPv6, nor does cygwin apache.

- if self.host.platform.is_cygwin() or self.get_option('use_apache') and self.host.platform.is_win():

+ if self.host.platform.is_cygwin() or (self.uses_apache() and self.host.platform.is_win()):

return False

return True