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

kbr at google.com kbr at google.com
Wed Dec 22 14:44:40 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 87b5a75ce4c253e96c7baa967d27ed66d9ed93fc
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 19 03:22:04 2010 +0000

    2010-10-18  Kenneth Russell  <kbr at google.com>
    
            Reviewed by Tony Chang.
    
            Regression in run_webkit_tests_unittest from r70017
            https://bugs.webkit.org/show_bug.cgi?id=47875
    
            * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70021 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e44368c..91f0ef4 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-18  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by Tony Chang.
+
+        Regression in run_webkit_tests_unittest from r70017
+        https://bugs.webkit.org/show_bug.cgi?id=47875
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
+
 2010-10-18  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
index 11b77db..a099eb7 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
@@ -264,7 +264,7 @@ class MainTest(unittest.TestCase):
 
 def _mocked_open(original_open, file_list):
     def _wrapper(name, mode, encoding):
-        if name.find("-expected.") != -1 and mode == "w":
+        if name.find("-expected.") != -1 and mode.find("w") != -1:
             # we don't want to actually write new baselines, so stub these out
             name.replace('\\', '/')
             file_list.append(name)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list