Clean up the webkitpy.layout_tests.servers.pywebsocket implementation.

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

Index: Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py b/Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py
index dafba0a8a1d55fa28d34abe41938f35953b24e8c..966ed712e5f2e07d09df80de35f51dcc34930e09 100644
--- a/Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py
+++ b/Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-"""A class to help start/stop the PyWebSocket server used by layout tests."""
+"""A class to help start/stop the PyWebSocket server as used by the layout tests."""
 
 import logging
 import os
@@ -34,118 +34,43 @@ import sys
 import time
 
 from webkitpy.layout_tests.servers import server_base
+from webkitpy.thirdparty import mod_pywebsocket
 
 _log = logging.getLogger(__name__)
 
 
 _WS_LOG_PREFIX = 'pywebsocket.ws.log-'
-_WSS_LOG_PREFIX = 'pywebsocket.wss.log-'
-
 
 _DEFAULT_WS_PORT = 8880
-_DEFAULT_WSS_PORT = 9323
 
 
 class PyWebSocket(server_base.ServerBase):
-    def __init__(self, port_obj, output_dir, port=_DEFAULT_WS_PORT,
-                 root=None, use_tls=False,
-                 private_key=None, certificate=None, ca_certificate=None,
-                 pidfile=None):
-        """Args:
-          output_dir: the absolute path to the layout test result directory
-        """
-        super(PyWebSocket, self).__init__(port_obj, output_dir)
-        self._pid_file = pidfile
-        self._process = None
-
-        self._port = port
-        self._root = root
-        self._use_tls = use_tls
 
+    def __init__(self, port_obj, output_dir, additional_dirs=None):
+        super(PyWebSocket, self).__init__(port_obj, output_dir)
         self._name = 'pywebsocket'
         self._log_prefixes = (_WS_LOG_PREFIX,)
-        if self._use_tls:
-            self._name = 'pywebsocket_secure'
-            self._log_prefixes = (_WSS_LOG_PREFIX,)
-
-        # Self generated certificate for SSL server (for client cert get
-        # <base-path>\chrome\test\data\ssl\certs\root_ca_cert.crt)
-        self._pem_file = os.path.join(
-            os.path.dirname(os.path.abspath(__file__)), 'httpd2.pem')
-
-        if private_key:
-            self._private_key = private_key
-        else:
-            self._private_key = self._pem_file
-        if certificate:
-            self._certificate = certificate
-        else:
-            self._certificate = self._pem_file
-        self._ca_certificate = ca_certificate
-        if self._port:
-            self._port = int(self._port)
-        self._mappings = [{'port': self._port}]
-
-        if not self._pid_file:
-            self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % self._name)
-
-        # Webkit tests
-        # FIXME: This is the wrong way to detect if we're in Chrome vs. WebKit!
-        # The port objects are supposed to abstract this.
-        if self._root:
-            self._layout_tests = self._filesystem.abspath(self._root)
-            self._web_socket_tests = self._filesystem.abspath(self._filesystem.join(self._root, 'http', 'tests', 'websocket'))
-        else:
-            try:
-                self._layout_tests = self._port_obj.layout_tests_dir()
-                self._web_socket_tests = self._filesystem.join(self._layout_tests, 'http', 'tests', 'websocket')
-            except:
-                self._web_socket_tests = None
+        self._mappings = [{'port': _DEFAULT_WS_PORT}]
+        self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % self._name)
 
-        if self._use_tls:
-            self._log_prefix = _WSS_LOG_PREFIX
-        else:
-            self._log_prefix = _WS_LOG_PREFIX
-
-    def _prepare_config(self):
+        self._port = _DEFAULT_WS_PORT
+        self._layout_tests = self._port_obj.layout_tests_dir()
+        self._web_socket_tests = self._filesystem.join(self._layout_tests, 'http', 'tests', 'websocket')
         time_str = time.strftime('%d%b%Y-%H%M%S')
-        log_file_name = self._log_prefix + time_str
-        # FIXME: Doesn't Executive have a devnull, so that we don't have to use os.devnull directly?
-
+        log_file_name = _WS_LOG_PREFIX + time_str
         error_log = self._filesystem.join(self._output_dir, log_file_name + "-err.txt")
-
-        from webkitpy.thirdparty import mod_pywebsocket
-        python_interp = sys.executable
-        # FIXME: Use self._filesystem.path_to_module(self.__module__) instead of __file__
-        # I think this is trying to get the chrome directory?  Doesn't the port object know that?
-        pywebsocket_base = self._filesystem.join(self._filesystem.dirname(self._filesystem.dirname(self._filesystem.dirname(self._filesystem.abspath(__file__)))), 'thirdparty')
+        pywebsocket_base = self._port_obj.path_from_webkit_base('Tools', 'Scripts', 'webkitpy', 'thirdparty')
         pywebsocket_script = self._filesystem.join(pywebsocket_base, 'mod_pywebsocket', 'standalone.py')
-        start_cmd = [
-            python_interp, '-u', pywebsocket_script,
+
+        self._start_cmd = [
+            sys.executable, '-u', pywebsocket_script,
             '--server-host', 'localhost',
             '--port', str(self._port),
             '--document-root', self._web_socket_tests,
             '--scan-dir', self._web_socket_tests,
             '--cgi-paths', '/',
             '--log-file', error_log,
-        ]
-
-        handler_map_file = self._filesystem.join(self._web_socket_tests, 'handler_map.txt')
-        if self._filesystem.exists(handler_map_file):
-            _log.debug('Using handler_map_file: %s' % handler_map_file)
-            start_cmd.append('--websock-handlers-map-file')
-            start_cmd.append(handler_map_file)
-        else:
-            _log.warning('No handler_map_file found')
-
-        if self._use_tls:
-            start_cmd.extend(['-t', '-k', self._private_key,
-                              '-c', self._certificate])
-            if self._ca_certificate:
-                start_cmd.append('--ca-certificate')
-                start_cmd.append(self._ca_certificate)
-
-        self._start_cmd = start_cmd
-        server_name = self._filesystem.basename(pywebsocket_script)
-        self._env = self._port_obj.setup_environ_for_server(server_name)
-        self._env['PYTHONPATH'] = (pywebsocket_base + os.path.pathsep + self._env.get('PYTHONPATH', ''))
+            '--websock-handlers-map-file', self._filesystem.join(self._web_socket_tests, 'handler_map.txt'),
+            ]
+        self._env = self._port_obj.setup_environ_for_server()
+        self._env['PYTHONPATH'] = (pywebsocket_base + os.pathsep + self._env.get('PYTHONPATH', ''))