Tools/Scripts/webkitpy/layout_tests/servers/server_base_unittest.py - Issue 135583003: checkpoint Blink-side work to use Apache on Windows

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/server_base_unittest.py

Issue 135583003: checkpoint Blink-side work to use Apache on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: new rollup patch 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/server_base.py ('k') | Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base_unittest.py b/Tools/Scripts/webkitpy/layout_tests/servers/server_base_unittest.py

similarity index 93%

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

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

index c6fb2e9cff65fb0ed352ee362d19d71b0bfd4214..8a1a992a06a197b1b40919e1cac4fccb09ff6078 100644

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

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

@@ -30,17 +30,17 @@ import webkitpy.thirdparty.unittest2 as unittest

from webkitpy.common.host_mock import MockHost

from webkitpy.layout_tests.port import test

-from webkitpy.layout_tests.servers.http_server_base import HttpServerBase

+from webkitpy.layout_tests.servers.server_base import ServerBase

-class TestHttpServerBase(unittest.TestCase):

+class TestServerBase(unittest.TestCase):

def test_corrupt_pid_file(self):

# This tests that if the pid file is corrupt or invalid,

# both start() and stop() deal with it correctly and delete the file.

host = MockHost()

test_port = test.TestPort(host)

- server = HttpServerBase(test_port)

+ server = ServerBase(test_port, test_port.default_results_directory())

server._pid_file = '/tmp/pidfile'

server._spawn_process = lambda: 4

server._is_server_running_on_all_ports = lambda: True