Tools/Scripts/webkitpy/layout_tests/servers/apache_http_unittest.py - Issue 157123002: Rename the modules and classes in webkitpy.layout_tests.servers.

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/servers/apache_http_unittest.py

Issue 157123002: Rename the modules and classes in webkitpy.layout_tests.servers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: fix apache class name Created 6 years, 10 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 | « Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py ('k') | Tools/Scripts/webkitpy/layout_tests/servers/crash_service.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Tools/Scripts/webkitpy/layout_tests/servers/apache_http_unittest.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py b/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_unittest.py

similarity index 90%

rename from Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py

rename to Tools/Scripts/webkitpy/layout_tests/servers/apache_http_unittest.py

index 4d0641cb18bba99b77747caa16a95744d4413ede..7b44bf2a99168db577fe06b2f4e1f3b81bb7277a 100644

--- a/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py

+++ b/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_unittest.py

@@ -34,11 +34,11 @@ from webkitpy.common.system.executive_mock import MockExecutive

from webkitpy.common.system.outputcapture import OutputCapture

from webkitpy.common.host_mock import MockHost

from webkitpy.layout_tests.port import test

-from webkitpy.layout_tests.servers.apache_http_server import LayoutTestApacheHttpd

-from webkitpy.layout_tests.servers.http_server_base import ServerError

+from webkitpy.layout_tests.servers.apache_http import ApacheHTTP

+from webkitpy.layout_tests.servers.server_base import ServerError

-class TestLayoutTestApacheHttpd(unittest.TestCase):

+class TestApacheHTTP(unittest.TestCase):

def test_start_cmd(self):

# Fails on win - see https://bugs.webkit.org/show_bug.cgi?id=84726

if sys.platform in ('cygwin', 'win32'):

@@ -53,7 +53,7 @@ class TestLayoutTestApacheHttpd(unittest.TestCase):

test_port = test.TestPort(host)

host.filesystem.write_text_file(test_port.path_to_apache_config_file(), '')

- server = LayoutTestApacheHttpd(test_port, "/mock/output_dir", number_of_servers=4)

+ server = ApacheHTTP(test_port, "/mock/output_dir", number_of_servers=4)

server._check_that_all_ports_are_available = lambda: True

server._is_server_running_on_all_ports = lambda: True

server._wait_for_action = fake_pid