Diff
Modified: trunk/Tools/ChangeLog (92799 => 92800)
--- trunk/Tools/ChangeLog 2011-08-10 21:51:53 UTC (rev 92799)
+++ trunk/Tools/ChangeLog 2011-08-10 23:16:15 UTC (rev 92800)
@@ -1,3 +1,12 @@
+2011-08-10 Eric Seidel <[email protected]>
+
+ new-run-webkit-test's WinPort has no fallback logic
+ https://bugs.webkit.org/show_bug.cgi?id=64486
+
+ Unreviewed. Fix test-webkitpy under Python 2.5.
+
+ * Scripts/webkitpy/layout_tests/port/win.py:
+
2011-08-10 Benjamin Poulain <[email protected]>
[Qt][WK2] MiniBrowser is firing twice the QDesktopWebView::mousePressEvent method
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (92799 => 92800)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-08-10 21:51:53 UTC (rev 92799)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-08-10 23:16:15 UTC (rev 92800)
@@ -41,7 +41,7 @@
from webkitpy.common.memoized import memoized
from webkitpy.common.net.buildbot import BuildBot
-from webkitpy.common.system.executive import ScriptError
+from webkitpy.common.system.executive import Executive, ScriptError
from webkitpy.layout_tests.port import builders, server_process, Port, Driver, DriverOutput
@@ -229,7 +229,7 @@
"""Return the supported features of DRT. If a port doesn't support
this DRT switch, it has to override this method to return None"""
supported_features_command = [self._path_to_driver(), '--print-supported-features']
- output = self._executive.run_command(supported_features_command)
+ output = self._executive.run_command(supported_features_command, error_handler=Executive.ignore_error)
# Note: win/DumpRenderTree.cpp does not print a leading space before the features_string.
match_object = re.match("SupportedFeatures:\s*(?P<features_string>.*)\s*", output)
if not match_object:
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py (92799 => 92800)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2011-08-10 21:51:53 UTC (rev 92799)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2011-08-10 23:16:15 UTC (rev 92800)
@@ -103,9 +103,9 @@
def test_runtime_feature_list(self):
port = WebKitPort(executive=MockExecutive())
- port._executive.run_command = lambda command, cwd=None: "Nonsense"
+ port._executive.run_command = lambda command, cwd=None, error_handler=None: "Nonsense"
self.assertEquals(port._runtime_feature_list(), [])
- port._executive.run_command = lambda command, cwd=None: "SupportedFeatures:foo bar"
+ port._executive.run_command = lambda command, cwd=None, error_handler=None: "SupportedFeatures:foo bar"
self.assertEquals(port._runtime_feature_list(), ['foo', 'bar'])
def test_skipped_directories_for_features(self):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py (92799 => 92800)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py 2011-08-10 21:51:53 UTC (rev 92799)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py 2011-08-10 23:16:15 UTC (rev 92800)
@@ -43,7 +43,7 @@
# This is a list of all supported OS-VERSION pairs for the AppleWin port
# and the order of fallback between them. Matches ORWT.
- VERSION_FALLBACK_ORDER = ("win-xp", "win-vista", "win-7sp0", "win")
+ VERSION_FALLBACK_ORDER = ["win-xp", "win-vista", "win-7sp0", "win"]
def _version_string_from_windows_version_tuple(self, windows_version_tuple):
if windows_version_tuple[:3] == (6, 1, 7600):
@@ -59,7 +59,7 @@
# Callers can then decide what version they want to pretend to be.
try:
ver_output = self._executive.run_command(['cmd', '/c', 'ver'])
- except (ScriptError, OSError) as e:
+ except (ScriptError, OSError), e:
ver_output = ""
_log.error("Failed to detect Windows version, assuming latest.\n%s" % e)
match_object = re.search(r'(?P<major>\d)\.(?P<minor>\d)\.(?P<build>\d+)', ver_output)
