[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[abarth at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 1c5f9e4fcde799e6f164ad1c32852d87d5391e4c
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 22 05:59:51 2011 +0000

    2011-01-21  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Maciej Stachowiak.
    
            Disable mac_unittest.py that fails on some of the Mac bots
            https://bugs.webkit.org/show_bug.cgi?id=52947
    
            As noted in the comment, this test does not appear to be correct
            because the function this test is testing returns different results
            depending on which flavor of Mac the test is run on.  This patch
            disable the test.  Hopefully we can re-enable the test once we've
            probably insulated the test from its environment.
    
            * Scripts/webkitpy/layout_tests/port/mac_unittest.py:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76428 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index b07c715..ac15ac7 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-21  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Maciej Stachowiak.
+
+        Disable mac_unittest.py that fails on some of the Mac bots
+        https://bugs.webkit.org/show_bug.cgi?id=52947
+
+        As noted in the comment, this test does not appear to be correct
+        because the function this test is testing returns different results
+        depending on which flavor of Mac the test is run on.  This patch
+        disable the test.  Hopefully we can re-enable the test once we've
+        probably insulated the test from its environment.
+
+        * Scripts/webkitpy/layout_tests/port/mac_unittest.py:
+
 2011-01-21  Dirk Pranke  <dpranke at chromium.org>
 
         Reviewed by Mihai Parparita.
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py
index eec1102..18ba414 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py
@@ -43,7 +43,10 @@ class MacTest(port_testcase.PortTestCase):
         port_obj._options.configuration = 'Release'
         return port_obj
 
-    def test_skipped_file_paths(self):
+    # FIXME: This test does not appear to be correct. It seems to receive
+    # different answers on different platforms. We should consider re-enabling
+    # it once we've worked out how to make it correct.
+    def disabled_test_skipped_file_paths(self):
         port = self.make_port()
         if not port:
             return

-- 
WebKit Debian packaging