test_start_cmd (webkitpy.layout_tests.servers.http_server_unittest.TestHttpServer...

https://bugs.webkit.org/show_bug.cgi?id=80468

Unreviewed, build fix.

Fixing a bug revealed by r80443 when we fixed filesystem.copyfile().

* Scripts/webkitpy/layout_tests/servers/http_server.py:
(Lighttpd._prepare_config):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@109995 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 3746001..0a63c49 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,17 @@
 2012-03-06  Dirk Pranke  <dpranke@chromium.org>
 
+        test_start_cmd (webkitpy.layout_tests.servers.http_server_unittest.TestHttpServer) is broken
+        https://bugs.webkit.org/show_bug.cgi?id=80468
+
+        Unreviewed, build fix.
+
+        Fixing a bug revealed by r80443 when we fixed filesystem.copyfile().
+
+        * Scripts/webkitpy/layout_tests/servers/http_server.py:
+        (Lighttpd._prepare_config):
+
+2012-03-06  Dirk Pranke  <dpranke@chromium.org>
+
         remove chromium_gpu ports
         https://bugs.webkit.org/show_bug.cgi?id=80345
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py b/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py
index 1f14e0d..8def09d 100755 (executable)
--- a/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py
+++ b/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py
@@ -179,11 +179,11 @@ class Lighttpd(http_server_base.HttpServerBase):
         # bug that mod_alias.so loads it from the hard coded path.
         if sys.platform == 'darwin':
             tmp_module_path = '/tmp/lighttpd/lib'
-            if not os.path.exists(tmp_module_path):
-                os.makedirs(tmp_module_path)
+            if not self._filesystem.exists(tmp_module_path):
+                self._filesystem.maybe_make_directory(tmp_module_path)
             lib_file = 'liblightcomp.dylib'
-            self._filesystem.copyfile(os.path.join(module_path, lib_file),
-                                      os.path.join(tmp_module_path, lib_file))
+            self._filesystem.copyfile(self._filesystem.join(module_path, lib_file),
+                                      self._filesystem.join(tmp_module_path, lib_file))
 
         self._start_cmd = start_cmd
         self._env = self._port_obj.setup_environ_for_server('lighttpd')