Changeset 120370 in webkit

Timestamp:

Jun 14, 2012, 4:18:09 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

webkitpy: remove DummyOptions and clean up the code in Port.get_option() and Port.set_option_default()
​https://bugs.webkit.org/show_bug.cgi?id=89135

Reviewed by Ryosuke Niwa.

This patch is just some minor cleanup and simplification. There
should be no functional changes here.

• Scripts/webkitpy/layout_tests/port/base.py:

(Port.init):
(Port.get_option):
(Port.set_option_default):

• Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py:

(ChromiumWinTest.test_setup_environ_for_server_register_cygwin):

• Scripts/webkitpy/style/checkers/test_expectations.py:

(TestExpectationsChecker._determine_port_from_expectations_path):

• Scripts/webkitpy/tool/mocktool.py:

(MockOptions.ensure_value):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (4 diffs)
• Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/style/checkers/test_expectations.py (modified) (3 diffs)
• Scripts/webkitpy/tool/mocktool.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-06-14  Dirk Pranke  <dpranke@chromium.org>
+
+        webkitpy: remove DummyOptions and clean up the code in Port.get_option() and Port.set_option_default()
+        https://bugs.webkit.org/show_bug.cgi?id=89135
+
+        Reviewed by Ryosuke Niwa.
+
+        This patch is just some minor cleanup and simplification. There
+        should be no functional changes here.
+
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        (Port.__init__):
+        (Port.get_option):
+        (Port.set_option_default):
+        * Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py:
+        (ChromiumWinTest.test_setup_environ_for_server_register_cygwin):
+        * Scripts/webkitpy/style/checkers/test_expectations.py:
+        (TestExpectationsChecker._determine_port_from_expectations_path):
+        * Scripts/webkitpy/tool/mocktool.py:
+        (MockOptions.ensure_value):
+
 2012-06-14  Ian Vollick  <vollick@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py

@@ -35 +35 @@
 import errno
 import os
+import optparse
 import re
 
@@ -62 +63 @@
 
 
-class DummyOptions(object):
-    """Fake implementation of optparse.Values. Cloned from webkitpy.tool.mocktool.MockOptions."""
-
-    def __init__(self, *args, **kwargs):
-        # The caller can set option values using keyword arguments. We don't
-        # set any values by default because we don't know how this
-        # object will be used. Generally speaking unit tests should
-        # subclass this or provider wrapper functions that set a common
-        # set of options.
-        for key, value in kwargs.items():
-            self.__dict__[key] = value
-
-
 # FIXME: This class should merge with WebKitPort now that Chromium behaves mostly like other webkit ports.
 class Port(object):
@@ -112 +100 @@
         # well-formed options object that had all of the necessary
         # options defined on it.
-        self._options = options or DummyOptions()
+        self._options = options or optparse.Values()
 
         self.host = host
@@ -679 +667 @@
 
     def get_option(self, name, default_value=None):
-        # FIXME: Eventually we should not have to do a test for
-        # hasattr(), and we should be able to just do
-        # self.options.value. See additional FIXME in the constructor.
-        if hasattr(self._options, name):
-            return getattr(self._options, name)
-        return default_value
+        return getattr(self._options, name, default_value)
 
     def set_option_default(self, name, default_value):
-        # FIXME: Callers could also use optparse_parser.Values.ensure_value,
-        # since this should always be a optparse_parser.Values object.
-        if not hasattr(self._options, name) or getattr(self._options, name) is None:
-            return setattr(self._options, name, default_value)
+        return self._options.ensure_value(name, default_value)
 
     def path_from_webkit_base(self, *comps):

trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py

@@ -39 +39 @@
 
 class ChromiumWinTest(port_testcase.PortTestCase):
-    class RegisterCygwinOption(object):
-        def __init__(self):
-            self.register_cygwin = True
-            self.results_directory = '/'
-
     port_name = 'chromium-win'
     port_maker = chromium_win.ChromiumWinPort
@@ -68 +63 @@
 
     def test_setup_environ_for_server_register_cygwin(self):
-        port = self.make_port(options=ChromiumWinTest.RegisterCygwinOption())
+        port = self.make_port(options=MockOptions(register_cygwin=True, results_directory='/'))
         port._executive = MockExecutive(should_log=True)
         expected_stderr = "MOCK run_command: ['/mock-checkout/Source/WebKit/chromium/third_party/cygwin/setup_mount.bat'], cwd=None\n"

trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations.py

@@ -30 +30 @@
 
 import logging
+import optparse
 import os
 import re
@@ -37 +38 @@
 from webkitpy.common.host import Host
 from webkitpy.layout_tests.models.test_expectations import TestExpectationParser
-from webkitpy.layout_tests.port.base import DummyOptions
 
 
@@ -50 +50 @@
     def _determine_port_from_expectations_path(self, host, expectations_path):
         # Pass a configuration to avoid calling default_configuration() when initializing the port (takes 0.5 seconds on a Mac Pro!).
-        options = DummyOptions(configuration='Release')
+        options = optparse.Values({'configuration': 'Release'})
         for port_name in host.port_factory.all_port_names():
             port = host.port_factory.get(port_name, options=options)

trunk/Tools/Scripts/webkitpy/tool/mocktool.py

@@ -37 +37 @@
 
 
-# FIXME: This should be moved somewhere in common and renamed
-# something without Mock in the name.
+# FIXME: We should just replace this with optparse.Values(default=kwargs)
 class MockOptions(object):
     """Mock implementation of optparse.Values."""
@@ -53 +52 @@
         self.__dict__.update(**kwargs)
         return self
+
+    def ensure_value(self, key, value):
+        if getattr(self, key, None) == None:
+            self.__dict__[key] = value
+        return self.__dict__[key]