Title: [99271] trunk/Tools
- Revision
- 99271
- Author
- [email protected]
- Date
- 2011-11-04 02:20:06 -0700 (Fri, 04 Nov 2011)
Log 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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (99270 => 99271)
--- trunk/Tools/ChangeLog 2011-11-04 09:13:14 UTC (rev 99270)
+++ trunk/Tools/ChangeLog 2011-11-04 09:20:06 UTC (rev 99271)
@@ -1,3 +1,19 @@
+2011-11-04 Eric Seidel <[email protected]>
+
+ 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 <[email protected]>
Enable ctrl-arrow move cursor by word in visual order in cr-win by command line flag.
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations.py (99270 => 99271)
--- trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations.py 2011-11-04 09:13:14 UTC (rev 99270)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations.py 2011-11-04 09:20:06 UTC (rev 99271)
@@ -66,10 +66,9 @@
try:
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
# expectations.
@@ -79,8 +78,7 @@
self._port_obj = port_factory.get('test')
# 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)
def _handle_error_message(self, lineno, message, confidence):
Modified: trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py (99270 => 99271)
--- trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py 2011-11-04 09:13:14 UTC (rev 99270)
+++ trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py 2011-11-04 09:20:06 UTC (rev 99271)
@@ -812,11 +812,11 @@
# Release versions.
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.')
return None
Modified: trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py (99270 => 99271)
--- trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py 2011-11-04 09:13:14 UTC (rev 99270)
+++ trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py 2011-11-04 09:20:06 UTC (rev 99271)
@@ -59,8 +59,8 @@
def __init__(self, config_expectations):
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])
ARCHIVE_URL = 'http://localhost/layout_test_results'
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
