Switch test_sky back to apache

sky/tools/webkitpy/layout_tests/port/base.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 16 matching lines @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 """Abstract base class of Port-specific entry points for the layout tests
 test infrastructure (the Port and Driver classes)."""
 
 import cgi
 import difflib
 import errno
 import itertools
 import logging
-import math
+import os
 import operator
 import optparse
-import os
+import math
 import re
-import subprocess
 import sys
 
 try:
     from collections import OrderedDict
 except ImportError:
     # Needed for Python < 2.7
     from webkitpy.thirdparty.ordered_dict import OrderedDict
 
 
 from webkitpy.common import find_files
@@ skipping 1039 matching lines @@
         """Does the port require an HTTP server for running tests? This could
         be the case when the tests aren't run on the host platform."""
         return True
 
     def start_http_server(self, additional_dirs, number_of_drivers):
         """Start a web server. Raise an error if it can't start or is already running.
 
         Ports can stub this out if they don't need a web server to be running."""
         assert not self._http_server, 'Already running an http server.'
 
-        self._http_server = subprocess.Popen([
-            self.path_to_script('sky_server'),
-            '-t', self.get_option('configuration'),
-            self.path_from_chromium_base(),
-            '8000',
-        ])
+        server = apache_http.ApacheHTTP(self, self.results_directory(),
+                                        additional_dirs=additional_dirs,
+                                        number_of_servers=number_of_drivers)
+        server.start()
+        self._http_server = server
 
     def start_websocket_server(self):
         """Start a web server. Raise an error if it can't start or is already running.
 
         Ports can stub this out if they don't need a websocket server to be running."""
         assert not self._websocket_server, 'Already running a websocket server.'
 
         server = pywebsocket.PyWebSocket(self, self.results_directory())
         server.start()
         self._websocket_server = server
@@ skipping 15 matching lines @@
                 self._helper.stdin.close()
                 self._helper.wait()
             except IOError, e:
                 pass
             finally:
                 self._helper = None
 
     def stop_http_server(self):
         """Shut down the http server if it is running. Do nothing if it isn't."""
         if self._http_server:
-            self._http_server.terminate()
+            self._http_server.stop()
             self._http_server = None
 
     def stop_websocket_server(self):
         """Shut down the websocket server if it is running. Do nothing if it isn't."""
         if self._websocket_server:
             self._websocket_server.stop()
             self._websocket_server = None
 
     #
     # TEST EXPECTATION-RELATED METHODS
@@ skipping 608 matching lines @@
 
 class PhysicalTestSuite(object):
     def __init__(self, base, args):
         self.name = base
         self.base = base
         self.args = args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self.args)