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

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit 6eb9e918d10a9ff7b79645ed4e17f9b362d3849e
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 27 20:53:59 2011 +0000

    2011-01-27  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Mihai Parparita.
    
            new-run-webkit-tests: turn off pixel tests correctly by default
            for webkit-based ports. r70013 (bug 47510) used
            port.set_option_default() to attempt to set default values, but
            that didn't work correctly. I have removed set_option_default
            for now since it was only being used in two places and in three
            useless unit tests. There is a separate bug open to fix the
            option parsing (48095), so this workaround is fine for now.
    
            https://bugs.webkit.org/show_bug.cgi?id=53217
    
            * Scripts/webkitpy/layout_tests/port/webkit.py:
            * Scripts/webkitpy/layout_tests/port/base.py:
            * Scripts/webkitpy/layout_tests/port/base_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76829 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 12283d3..93f200a 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,21 @@
+2011-01-27  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Mihai Parparita.
+
+        new-run-webkit-tests: turn off pixel tests correctly by default
+        for webkit-based ports. r70013 (bug 47510) used
+        port.set_option_default() to attempt to set default values, but
+        that didn't work correctly. I have removed set_option_default
+        for now since it was only being used in two places and in three
+        useless unit tests. There is a separate bug open to fix the
+        option parsing (48095), so this workaround is fine for now.
+
+        https://bugs.webkit.org/show_bug.cgi?id=53217
+
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        * Scripts/webkitpy/layout_tests/port/base_unittest.py:
+
 2011-01-27  Balazs Kelemen  <kbalazs at webkit.org>
 
         Rubber-stamped by Ariya Hidayat.
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/base.py b/Tools/Scripts/webkitpy/layout_tests/port/base.py
index aeebc66..75b83a7 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/base.py
@@ -121,8 +121,7 @@ class Port(object):
         # certainly won't be available, so it's a good test to keep us
         # from erroring out later.
         self._pretty_patch_available = self._filesystem.exists(self._pretty_patch_path)
-        self.set_option_default('configuration', None)
-        if self._options.configuration is None:
+        if not hasattr(self._options, 'configuration') or self._options.configuration is None:
             self._options.configuration = self.default_configuration()
 
     def default_child_processes(self):
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py
index 72f2d05..18b568c 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py
@@ -224,19 +224,6 @@ class PortTest(unittest.TestCase):
         port = base.Port()
         self.assertEqual(port.get_option('foo', 'bar'), 'bar')
 
-    def test_set_option_default__unset(self):
-        port = base.Port()
-        port.set_option_default('foo', 'bar')
-        self.assertEqual(port.get_option('foo'), 'bar')
-
-    def test_set_option_default__set(self):
-        options, args = optparse.OptionParser().parse_args([])
-        options.foo = 'bar'
-        port = base.Port(options=options)
-        # This call should have no effect.
-        port.set_option_default('foo', 'new_bar')
-        self.assertEqual(port.get_option('foo'), 'bar')
-
     def test_name__unset(self):
         port = base.Port()
         self.assertEqual(port.name(), None)
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/webkit.py b/Tools/Scripts/webkitpy/layout_tests/port/webkit.py
index 0834474..3f00927 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/webkit.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/webkit.py
@@ -57,7 +57,8 @@ class WebKitPort(base.Port):
 
         # FIXME: disable pixel tests until they are run by default on the
         # build machines.
-        self.set_option_default('pixel_tests', False)
+        if not hasattr(self._options, "pixel_tests") or self._options.pixel_tests == None:
+            self._options.pixel_tests = False
 
     def baseline_path(self):
         return self._webkit_baseline_path(self._name)
@@ -120,9 +121,9 @@ class WebKitPort(base.Port):
         return self._diff_image_reply(sp, diff_filename)
 
     def _diff_image_request(self, expected_contents, actual_contents):
-        # FIXME: use self.get_option('tolerance') and
-        # self.set_option_default('tolerance', 0.1) once that behaves correctly
-        # with default values.
+        # FIXME: There needs to be a more sane way of handling default
+        # values for options so that you can distinguish between a default
+        # value of None and a default value that wasn't set.
         if self.get_option('tolerance') is not None:
             tolerance = self.get_option('tolerance')
         else:

-- 
WebKit Debian packaging