Changeset 99271 in webkit

Timestamp:

Nov 4, 2011, 2:20:06 AM (15 years ago)

Author:

eric@webkit.org

Message:

Remove deprecated free functions in port.factory
​https://bugs.webkit.org/show_bug.cgi?id=71494

Unreviewed. Fixing exception seen when running test-webkitpy.

Sorry, I previously had deleted the relevant rebaseline-chromium-webkit-tests
unittest, since that script is nearly ready to be deleted. But I added
it back at the last second and failed to run the tests. :(
This fixes the exception the bots were seeing.

• Scripts/webkitpy/style/checkers/test_expectations.py:
• Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py:
• Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checkers/test_expectations.py (modified) (2 diffs)
• Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py (modified) (1 diff)
• Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-04  Eric Seidel  <eric@webkit.org>
+
+        Remove deprecated free functions in port.factory
+        https://bugs.webkit.org/show_bug.cgi?id=71494
+
+        Unreviewed.  Fixing exception seen when running test-webkitpy.
+
+        Sorry, I previously had deleted the relevant rebaseline-chromium-webkit-tests
+        unittest, since that script is nearly ready to be deleted.  But I added
+        it back at the last second and failed to run the tests. :(
+        This fixes the exception the bots were seeing.
+
+        * Scripts/webkitpy/style/checkers/test_expectations.py:
+        * Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py:
+        * Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py:
+
 2011-11-02  Xiaomei Ji  <xji@chromium.org>
 

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

@@ -67 +67 @@
             port_name = self._file_path.split(os.sep)[-2]
             if port_name == "chromium":
-                options = ChromiumOptions()
-                self._port_obj = port_factory.get(port_name=None, options=options)
+                self._port_obj = port_factory.get(options=ChromiumOptions())
             else:
-                self._port_obj = port_factory.get(port_name=port_name)
+                self._port_obj = port_factory.get(port_name)
         except:
             # Using 'test' port when we couldn't determine the port for this
@@ -80 +79 @@
         # Suppress error messages of test_expectations module since they will be
         # reported later.
-        log = logging.getLogger("webkitpy.layout_tests.layout_package."
-                                "test_expectations")
+        log = logging.getLogger("webkitpy.layout_tests.layout_package.test_expectations")
         log.setLevel(logging.CRITICAL)
 

trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py

@@ -813 +813 @@
     options.configuration = "Release"
     options.chromium = True
-    port_obj = port_factory.get(None, options)
+    port_obj = port_factory.get(options=options)
     if not port_obj.check_image_diff(override_step=None, logging=False):
         _log.debug('No release version of the image diff binary was found.')
         options.configuration = "Debug"
-        port_obj = port_factory.get(None, options)
+        port_obj = port_factory.get(options=options)
         if not port_obj.check_image_diff(override_step=None, logging=False):
             _log.error('No version of image diff was found. Check your build.')

trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py

@@ -60 +60 @@
         self.config_expectations = config_expectations
 
-    def get(port_name, options):
-        return MockPort(config_expectations[options.configuration])
+    def get(self, port_name=None, options=None):
+        return MockPort(self.config_expectations[options.configuration])