[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d472f85c42c205578792da8ddf38bcce9ca73e1c
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 15 08:20:54 2010 +0000

    2010-10-15  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Adam Barth.
    
            test-webkitpy fails on Linux
            https://bugs.webkit.org/show_bug.cgi?id=47713
    
            The old code failed on Linux because the MacPort tries to read
            something out of platform that doesn't make sense on Linux.
    
            * Scripts/webkitpy/tool/mocktool.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69843 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 33322c1..9df3015 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-15  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        test-webkitpy fails on Linux
+        https://bugs.webkit.org/show_bug.cgi?id=47713
+
+        The old code failed on Linux because the MacPort tries to read
+        something out of platform that doesn't make sense on Linux.
+
+        * Scripts/webkitpy/tool/mocktool.py:
+
 2010-10-14  Balazs Kelemen  <kbalazs at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/Scripts/webkitpy/tool/mocktool.py b/WebKitTools/Scripts/webkitpy/tool/mocktool.py
index fb49db9..5285837 100644
--- a/WebKitTools/Scripts/webkitpy/tool/mocktool.py
+++ b/WebKitTools/Scripts/webkitpy/tool/mocktool.py
@@ -30,7 +30,6 @@ import os
 import threading
 
 from webkitpy.common.config.committers import CommitterList, Reviewer
-from webkitpy.common.config.ports import MacPort
 from webkitpy.common.checkout.commitinfo import CommitInfo
 from webkitpy.common.checkout.scm import CommitMessage
 from webkitpy.common.net.bugzilla import Bug, Attachment
@@ -647,8 +646,7 @@ class MockTool():
         return "echo"
 
     def port(self):
-        # FIXME: Consider using a mock here.
-        return MacPort
+        return Mock()
 
 
 class MockBrowser(object):

-- 
WebKit Debian packaging