Support running tests under LayoutTests/http/tests/local as local file, in or...

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 179 matching lines @@
     relative_path = relative_path[len(LAYOUTTEST_HTTP_DIR):]
     port = 8000
     # pending/http/tests/ run off port 9000 and ssl/ off 9443
   elif relative_path.startswith(PENDING_HTTP_DIR):
     relative_path = relative_path[len(PENDING_HTTP_DIR):]
     port = 9000
     # chrome/http/tests run off of port 8081 with the full path
   elif relative_path.find("/http/") >= 0:
     port = 8081
 
-  if port:
+  # Make LayoutTests/http/tests/local run as local files. This is to mimic the
+  # logic in run-webkit-tests.
+  # TODO: Should we also extend this to media/?

[ojan, 2009/09/11 03:23:04]

nit: TODO(jianli). Even if you don't intend to do this, the name in the TODO is
supposed to be the person who added that TODO since you'll be the right person
to talk to if someone else decided to take it on.

Also, seems pretty likely that we want to mimic exactly what run-webkit-tests
does. So feel free to extend this to media/. Or do it as a followup change.
Either way is fine.

+  if port and not relative_path.startswith("local/"):
     if relative_path.startswith("ssl/"):
       port += 443
       protocol = "https"
     else:
       protocol = "http"
     return "%s://127.0.0.1:%u/%s" % (protocol, port, relative_path)
-  else:
-    return "file:///" + GetAbsolutePath(full_path)
+
+  return "file:///" + GetAbsolutePath(full_path)
 
 def GetAbsolutePath(path):
   """Returns an absolute UNIX path."""
   return _WinPathToUnix(os.path.abspath(path))
 
 def MaybeMakeDirectory(*path):
   """Creates the specified directory if it doesn't already exist."""
   # This is a reimplementation of google.path_utils.MaybeMakeDirectory().
   try:
     os.makedirs(os.path.join(*path))
@@ skipping 57 matching lines @@
   return platform_utils.ImageDiffPath(target)
 
 def LayoutTestHelperPath(target):
   return platform_utils.LayoutTestHelperPath(target)
 
 def FuzzyMatchPath():
   return platform_utils.FuzzyMatchPath()
 
 def ShutDownHTTPServer(server_process):
   return platform_utils.ShutDownHTTPServer(server_process)