Changeset 267508 in webkit

Timestamp:

Sep 23, 2020, 4:28:50 PM (6 years ago)

Author:

Jonathan Bedard

Message:

webkitpy: Make sw_vers the source of truth for the MacOS version
​https://bugs.webkit.org/show_bug.cgi?id=216903
<rdar://problem/69462735>

Reviewed by Dewei Zhu.

• Scripts/webkitpy/common/system/platforminfo.py:

(PlatformInfo.init): Use sw_vers instead of platform.mac_ver().

• Scripts/webkitpy/common/system/platforminfo_unittest.py:

(fake_executive): Set a valid return value for sw_vers by default.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/platforminfo.py (modified) (1 diff)
• Scripts/webkitpy/common/system/platforminfo_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-09-23  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpy: Make sw_vers the source of truth for the MacOS version
+        https://bugs.webkit.org/show_bug.cgi?id=216903
+        <rdar://problem/69462735>
+
+        Reviewed by Dewei Zhu.
+
+        * Scripts/webkitpy/common/system/platforminfo.py:
+        (PlatformInfo.__init__): Use sw_vers instead of platform.mac_ver().
+        * Scripts/webkitpy/common/system/platforminfo_unittest.py:
+        (fake_executive): Set a valid return value for sw_vers by default.
+
 2020-09-23  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py

@@ -68 +68 @@
 
         if self.os_name.startswith('mac'):
-            self.os_version = Version.from_string(platform_module.mac_ver()[0])
+            self.os_version = Version.from_string(self._executive.run_command(['sw_vers', '-productVersion']).rstrip())
         elif self.os_name.startswith('win'):
             self.os_version = self._win_version()

trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py

@@ -65 +65 @@
     if output:
         return MockExecutive2(output=output)
-    return MockExecutive2(exception=SystemError)
+    return MockExecutive2(output='10.15.0\n')