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

webkit/tools/layout_tests/layout_package/path_utils.py

 # Copyright (c) 2006-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.
 
 """This package contains utility methods for manipulating paths and
 filenames for test results and baselines. It also contains wrappers
 of a few routines in platform_utils.py so that platform_utils.py can
 be considered a 'protected' package - i.e., this file should be
 the only file that ever includes platform_utils. This leads to
 us including a few things that don't really have anything to do
@@ skipping 163 matching lines @@
 def _WinPathToUnix(path):
   """Convert a windows path to use unix-style path separators (a/b/c)."""
   return path.replace('\\', '/')
 
 #
 # Routines that are arguably platform-specific but have been made
 # generic for now (they used to be in platform_utils_*)
 #
 def FilenameToUri(full_path):
   """Convert a test file to a URI."""
+  LAYOUTTESTS_DIR = "LayoutTests/"
   LAYOUTTEST_HTTP_DIR = "LayoutTests/http/tests/"
   PENDING_HTTP_DIR    = "pending/http/tests/"
   LAYOUTTEST_WEBSOCKET_DIR = "LayoutTests/websocket/tests/"
 
   relative_path = _WinPathToUnix(RelativeTestFilename(full_path))
   port = None
   use_ssl = False
 
   if relative_path.startswith(LAYOUTTEST_HTTP_DIR):
     # LayoutTests/http/tests/ run off port 8000 and ssl/ off 8443
     relative_path = relative_path[len(LAYOUTTEST_HTTP_DIR):]
     port = 8000
   elif relative_path.startswith(PENDING_HTTP_DIR):
     # pending/http/tests/ run off port 9000 and ssl/ off 9443
     relative_path = relative_path[len(PENDING_HTTP_DIR):]
     port = 9000
   elif relative_path.startswith(LAYOUTTEST_WEBSOCKET_DIR):
-    # LayoutTests/websocket/tests/ run off port 8880
-    relative_path = relative_path[len(LAYOUTTEST_WEBSOCKET_DIR):]
+    # LayoutTests/websocket/tests/ run off port 8880 and 9323
+    # Note: the root is LayoutTests/, not LayoutTests/websocket/tests/
+    relative_path = relative_path[len(LAYOUTTESTS_DIR):]
     port = 8880
   elif relative_path.find("/http/") >= 0:
     # chrome/http/tests run off of port 8081 with the full path
     port = 8081
 
   # Make LayoutTests/http/tests/local run as local files. This is to mimic the
   # logic in run-webkit-tests.
   # TODO(jianli): Consider extending this to "media/".
   if port and not relative_path.startswith("local/"):
     if relative_path.startswith("ssl/"):
@@ skipping 138 matching lines @@
   return platform_utils.LayoutTestHelperPath(target)
 
 def FuzzyMatchPath():
   return platform_utils.FuzzyMatchPath()
 
 def ShutDownHTTPServer(server_process):
   return platform_utils.ShutDownHTTPServer(server_process)
 
 def KillAllTestShells():
   platform_utils.KillAllTestShells()