Title: [276849] trunk/Tools
- Revision
- 276849
- Author
- [email protected]
- Date
- 2021-04-30 12:16:33 -0700 (Fri, 30 Apr 2021)
Log Message
Unreviewed, reverting r276846.
https://bugs.webkit.org/show_bug.cgi?id=225242
Breaks test execution in GTK and WPE ports
Reverted changeset:
"[webkitpy] Support pickling platforminfo"
https://bugs.webkit.org/show_bug.cgi?id=225230
https://trac.webkit.org/changeset/276846
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (276848 => 276849)
--- trunk/Tools/ChangeLog 2021-04-30 18:58:03 UTC (rev 276848)
+++ trunk/Tools/ChangeLog 2021-04-30 19:16:33 UTC (rev 276849)
@@ -1,3 +1,16 @@
+2021-04-30 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r276846.
+ https://bugs.webkit.org/show_bug.cgi?id=225242
+
+ Breaks test execution in GTK and WPE ports
+
+ Reverted changeset:
+
+ "[webkitpy] Support pickling platforminfo"
+ https://bugs.webkit.org/show_bug.cgi?id=225230
+ https://trac.webkit.org/changeset/276846
+
2021-04-30 Miguel Gomez <[email protected]>
[GTK][WPE] Properly recover from unresponsive web processes
Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py (276848 => 276849)
--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2021-04-30 18:58:03 UTC (rev 276848)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2021-04-30 19:16:33 UTC (rev 276849)
@@ -37,7 +37,7 @@
from webkitpy.common.memoized import memoized
from webkitpy.common.version_name_map import PUBLIC_TABLE, INTERNAL_TABLE, VersionNameMap
-from webkitpy.common.system.executive import Executive, ScriptError
+from webkitpy.common.system.executive import ScriptError
from webkitpy.port.config import apple_additions
@@ -59,10 +59,8 @@
newer than one known to the code.
"""
- def __init__(self, sys_module=None, platform_module=None, executive=None):
- sys_module = sys_module or sys
-
- self._executive = executive or Executive()
+ def __init__(self, sys_module, platform_module, executive):
+ self._executive = executive
self._platform_module = platform_module
self.os_name = self._determine_os_name(sys_module.platform)
self.os_version = None
@@ -136,12 +134,12 @@
def display_name(self):
# platform.platform() returns Darwin information for Mac, which is just confusing.
if self.is_mac():
- return "Mac OS X %s" % (self._platform_module or platform).mac_ver()[0]
+ return "Mac OS X %s" % self._platform_module.mac_ver()[0]
# Returns strings like:
# Linux-2.6.18-194.3.1.el5-i686-with-redhat-5.5-Final
# Windows-2008ServerR2-6.1.7600
- return (self._platform_module or platform).platform()
+ return self._platform_module.platform()
def os_version_name(self, table=None):
if not self.os_version:
@@ -248,7 +246,7 @@
return Version.from_iterable(match_object.groups())
def _win_version_str(self):
- version = (self._platform_module or platform).win32_ver()[1]
+ version = self._platform_module.win32_ver()[1]
if version:
return version
# Note that this should only ever be called on windows, so this should always work.
Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py (276848 => 276849)
--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py 2021-04-30 18:58:03 UTC (rev 276848)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py 2021-04-30 19:16:33 UTC (rev 276849)
@@ -75,7 +75,7 @@
# yet run by default and there's no reason not to run this everywhere by default.
def test_real_code(self):
# This test makes sure the real (unmocked) code actually works.
- info = PlatformInfo(executive=Executive())
+ info = PlatformInfo(sys, platform, Executive())
self.assertNotEqual(info.os_name, '')
if info.is_mac() or info.is_win():
self.assertIsNotNone(info.os_version)
Modified: trunk/Tools/Scripts/webkitpy/common/system/systemhost.py (276848 => 276849)
--- trunk/Tools/Scripts/webkitpy/common/system/systemhost.py 2021-04-30 18:58:03 UTC (rev 276848)
+++ trunk/Tools/Scripts/webkitpy/common/system/systemhost.py 2021-04-30 19:16:33 UTC (rev 276849)
@@ -38,7 +38,7 @@
def __init__(self):
self.executive = executive.Executive()
self.filesystem = filesystem.FileSystem()
- self.platform = platforminfo.PlatformInfo(executive=self.executive)
+ self.platform = platforminfo.PlatformInfo(sys, platform, self.executive)
self.user = user.User(self.platform)
self.workspace = workspace.Workspace(self.filesystem, self.executive)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
