Change the document root for the test Web Socket server to WebKit/LayoutTests...

webkit/tools/layout_tests/layout_package/websocket_server.py

 #!/usr/bin/env python
 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A class to help start/stop the PyWebSocket server used by layout tests."""
 
 
 import logging
 import optparse
 import os
 import subprocess
 import sys
 import tempfile
 import time
 
 import path_utils
 import platform_utils
 import http_server
 
 # So we can import httpd_utils below to make ui_tests happy.
 sys.path.append(path_utils.PathFromBase('tools', 'python'))
 import google.httpd_utils
 
 _WS_LOG_PREFIX = 'pywebsocket.ws.log-'
 _WSS_LOG_PREFIX = 'pywebsocket.wss.log-'
 
 _DEFAULT_WS_PORT = 8880
 _DEFAULT_WSS_PORT = 9323
-_DEFAULT_ROOT = '.'
 
 
 def RemoveLogFiles(folder, starts_with):
   files = os.listdir(folder)
   for file in files:
     if file.startswith(starts_with) :
       full_path = os.path.join(folder, file)
       os.remove(full_path)
 
 
 class PyWebSocketNotStarted(Exception):
   pass
 
 
 class PyWebSocket(http_server.Lighttpd):
   def __init__(self, output_dir, port=_DEFAULT_WS_PORT,
-               root=_DEFAULT_ROOT,
                use_tls=False,
                private_key=http_server.Lighttpd._pem_file,
                certificate=http_server.Lighttpd._pem_file):
     """Args:
       output_dir: the absolute path to the layout test result directory
     """
     self._output_dir = output_dir
     self._process = None
     self._port = port
-    self._root = root
     self._use_tls = use_tls
     self._private_key = private_key
     self._certificate = certificate
     if self._port:
       self._port = int(self._port)
     if self._use_tls:
       self._server_name = 'PyWebSocket(Secure)'
     else:
       self._server_name = 'PyWebSocket'
 
     # Webkit tests
     try:
-      self._webkit_tests = path_utils.PathFromBase(
+      self._web_socket_tests = path_utils.PathFromBase(
           'third_party', 'WebKit', 'LayoutTests', 'websocket', 'tests')
+      self._layout_tests = path_utils.PathFromBase(
+          'third_party', 'WebKit', 'LayoutTests')
     except path_utils.PathNotFound:
-      self._webkit_tests = None
+      self._web_socket_tests = None
 
   def Start(self):
-    if not self._webkit_tests:
+    if not self._web_socket_tests:
       logging.info('No need to start %s server.' % self._server_name)
       return
     if self.IsRunning():
       raise PyWebSocketNotStarted('%s is already running.' % self._server_name)
 
     time_str = time.strftime('%d%b%Y-%H%M%S')
     if self._use_tls:
       log_prefix = _WSS_LOG_PREFIX
     else:
       log_prefix = _WS_LOG_PREFIX
     log_file_name = log_prefix + time_str + '.txt'
     error_log = os.path.join(self._output_dir, log_file_name)
 
     # Remove old log files. We only need to keep the last ones.
     RemoveLogFiles(self._output_dir, log_prefix)
 
     python_interp = sys.executable
     pywebsocket_base = path_utils.PathFromBase('third_party', 'pywebsocket')
     pywebsocket_script = path_utils.PathFromBase(
         'third_party', 'pywebsocket', 'mod_pywebsocket', 'standalone.py')
     start_cmd = [
         python_interp, pywebsocket_script,
         '-p', str(self._port),
-        '-d', self._webkit_tests,
+        '-d', self._layout_tests,
+        '-s', self._web_socket_tests,
     ]
     if self._use_tls:
       start_cmd.extend(['-t', '-k', self._private_key,
                         '-c', self._certificate])
 
     # Put the cygwin directory first in the path to find cygwin1.dll
     env = os.environ
     if sys.platform in ('cygwin', 'win32'):
       env['PATH'] = '%s;%s' % (
           path_utils.PathFromBase('third_party', 'cygwin', 'bin'),
@@ skipping 39 matching lines @@
     # Wait a bit to make sure the ports are free'd up
     time.sleep(2)
 
 
 if '__main__' == __name__:
   # Provide some command line params for starting the PyWebSocket server
   # manually.
   option_parser = optparse.OptionParser()
   option_parser.add_option('-p', '--port', dest='port',
                            default=None, help='Port to listen on')
-  option_parser.add_option('-r', '--root', dest='root', default='.',
-                           help='Absolute path to DocumentRoot')
   option_parser.add_option('-t', '--tls', dest='use_tls', action='store_true',
                            default=False, help='use TLS (wss://)')
   option_parser.add_option('-k', '--private_key', dest='private_key',
                            default='', help='TLS private key file.')
   option_parser.add_option('-c', '--certificate', dest='certificate',
                            default='', help='TLS certificate file.')
   options, args = option_parser.parse_args()
 
   if not options.port:
     if options.use_tls:
       options.port = _DEFAULT_WSS_PORT
     else:
       options.port = _DEFAULT_WS_PORT
 
   kwds = {'port':options.port,
-          'root':options.root,
           'use_tls':options.use_tls}
   if options.private_key:
     kwds['private_key'] = options.private_key
   if options.certificate:
     kwds['certificate'] = options.certificate
 
   pywebsocket = PyWebSocket(tempfile.gettempdir(), **kwds)
   pywebsocket.Start()