Refactor webkitpy.layout_tests.servers.server_base.

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 2822446257cec91914596ce6c7d6e0dd5e5f4622..dafba0a8a1d55fa28d34abe41938f35953b24e8c 100644
--- a/Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py
+++ b/Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py
@@ -33,7 +33,6 @@ import os
 import sys
 import time
 
-from webkitpy.layout_tests.servers import lighttpd
 from webkitpy.layout_tests.servers import server_base
 
 _log = logging.getLogger(__name__)
@@ -47,7 +46,7 @@ _DEFAULT_WS_PORT = 8880
 _DEFAULT_WSS_PORT = 9323
 
 
-class PyWebSocket(lighttpd.Lighttpd):
+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,
@@ -55,10 +54,7 @@ class PyWebSocket(lighttpd.Lighttpd):
         """Args:
           output_dir: the absolute path to the layout test result directory
         """
-        super(PyWebSocket, self).__init__(port_obj, output_dir,
-                                          port=_DEFAULT_WS_PORT,
-                                          root=root)
-        self._output_dir = output_dir
+        super(PyWebSocket, self).__init__(port_obj, output_dir)
         self._pid_file = pidfile
         self._process = None
 
@@ -67,8 +63,15 @@ class PyWebSocket(lighttpd.Lighttpd):
         self._use_tls = use_tls
 
         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
@@ -81,8 +84,6 @@ class PyWebSocket(lighttpd.Lighttpd):
         self._ca_certificate = ca_certificate
         if self._port:
             self._port = int(self._port)
-        self._wsin = None
-        self._wsout = None
         self._mappings = [{'port': self._port}]
 
         if not self._pid_file:
@@ -110,11 +111,8 @@ class PyWebSocket(lighttpd.Lighttpd):
         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?

[scottmg, 2014/02/11 22:21:54]

remove comment

[Dirk Pranke, 2014/02/12 21:03:41]

That gets removed in https://codereview.chromium.org/159713010 , so I'll leave
as-is for now.

-        self._wsin = open(os.devnull, 'r')
 
         error_log = self._filesystem.join(self._output_dir, log_file_name + "-err.txt")
-        output_log = self._filesystem.join(self._output_dir, log_file_name + "-out.txt")
-        self._wsout = self._filesystem.open_text_file_for_writing(output_log)
 
         from webkitpy.thirdparty import mod_pywebsocket
         python_interp = sys.executable
@@ -151,25 +149,3 @@ class PyWebSocket(lighttpd.Lighttpd):
         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', ''))
-
-    def _remove_stale_logs(self):
-        try:
-            self._remove_log_files(self._output_dir, self._log_prefix)
-        except OSError, e:
-            _log.warning('Failed to remove stale %s log files: %s' % (self._name, str(e)))
-
-    def _spawn_process(self):
-        _log.debug('Starting %s server, cmd="%s"' % (self._name, self._start_cmd))
-        self._process = self._executive.popen(self._start_cmd, env=self._env, shell=False, stdin=self._wsin, stdout=self._wsout, stderr=self._executive.STDOUT)
-        self._filesystem.write_text_file(self._pid_file, str(self._process.pid))
-        return self._process.pid
-
-    def _stop_running_server(self):
-        super(PyWebSocket, self)._stop_running_server()
-
-        if self._wsin:
-            self._wsin.close()
-            self._wsin = None
-        if self._wsout:
-            self._wsout.close()
-            self._wsout = None