Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py - Issue 155173003: checkpoint unix version of apache win32 patch.

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_server_unittest.py

Issue 155173003: checkpoint unix version of apache win32 patch. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: re-daemonize apache on unix 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.py ('k') | Tools/Scripts/webkitpy/layout_tests/servers/http_server.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_server_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_server_unittest.py

index e68c5e39aa6440364fc4f0cd8ae438fb57849abd..ab21024bef778bb83a0190fb58de6679f76cba3a 100644

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

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

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

host = MockHost()

host.executive = MockExecutive(should_log=True)

test_port = test.TestPort(host)

- host.filesystem.write_text_file(test_port._path_to_apache_config_file(), '')

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

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

server._check_that_all_ports_are_available = lambda: True

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

server.stop()

finally:

_, _, logs = oc.restore_output()

- self.assertIn("StartServers 4", logs)

- self.assertIn("MinSpareServers 4", logs)

- self.assertIn("MaxSpareServers 4", logs)

- self.assertTrue(host.filesystem.exists("/mock/output_dir/httpd.conf"))

+ self.assertIn("StartServers 16", logs)

+ self.assertIn("MinSpareServers 16", logs)

+ self.assertIn("MaxSpareServers 16", logs)