Fix run-blink-httpd to work w/ Apache and refactor webkitpy.layout_tests.servers.

Tools/Scripts/webkitpy/layout_tests/servers/lighttpd_unittest.py

Index: Tools/Scripts/webkitpy/layout_tests/servers/lighttpd_unittest.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py b/Tools/Scripts/webkitpy/layout_tests/servers/lighttpd_unittest.py
similarity index 77%
rename from Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py
rename to Tools/Scripts/webkitpy/layout_tests/servers/lighttpd_unittest.py
index 740cd2b5692a4fd015f9a15af80ebc912597b7c6..4d1908d8a3a573ab66a4b490aca8a42ea3fc8705 100644
--- a/Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/servers/lighttpd_unittest.py
@@ -32,11 +32,11 @@ 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 import Lighttpd
-from webkitpy.layout_tests.servers.http_server_base import ServerError
+from webkitpy.layout_tests.servers.lighttpd import Lighttpd
+from webkitpy.layout_tests.servers.server_base import ServerError
 
 
-class TestHttpServer(unittest.TestCase):
+class TestLighttpdServer(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'):
@@ -49,17 +49,12 @@ class TestHttpServer(unittest.TestCase):
         host.filesystem.write_text_file(
             "/usr/lib/lighttpd/liblightcomp.dylib", "Mock dylib")
 
-        server = Lighttpd(test_port, "/mock/output_dir",
-                          additional_dirs={
-                              "/mock/one-additional-dir": "/mock-checkout/one-additional-dir",
-                              "/mock/another-additional-dir": "/mock-checkout/one-additional-dir"})
+        server = Lighttpd(test_port, "/mock/output_dir")
         self.assertRaises(ServerError, server.start)
 
         config_file = host.filesystem.read_text_file("/mock/output_dir/lighttpd.conf")
         self.assertEqual(re.findall(r"alias.url.+", config_file), [
             'alias.url = ( "/js-test-resources" => "/test.checkout/LayoutTests/resources" )',
-            'alias.url += ( "/mock/one-additional-dir" => "/mock-checkout/one-additional-dir" )',
-            'alias.url += ( "/mock/another-additional-dir" => "/mock-checkout/one-additional-dir" )',
             'alias.url += ( "/media-resources" => "/test.checkout/LayoutTests/media" )',
         ])
 
@@ -74,10 +69,7 @@ class TestHttpServer(unittest.TestCase):
         host.platform.is_win = lambda: True
         host.platform.is_cygwin = lambda: False
 
-        server = Lighttpd(test_port, "/mock/output_dir",
-                          additional_dirs={
-                              "/mock/one-additional-dir": "/mock-checkout/one-additional-dir",
-                              "/mock/another-additional-dir": "/mock-checkout/one-additional-dir"})
+        server = Lighttpd(test_port, "/mock/output_dir")
         server._check_that_all_ports_are_available = lambda: True
         server._is_server_running_on_all_ports = lambda: True
 
@@ -96,6 +88,4 @@ class TestHttpServer(unittest.TestCase):
 
         host.executive.check_running_pid = mock_returns([True, False])
         server._wait_for_action = wait_for_action
-
         server.stop()
-        self.assertEqual(['taskkill.exe', '/f', '/t', '/pid', 42], host.executive.calls[1])