Attachment 339775 Details for Bug 185387 – Patch

[patch] Patch

bug-185387-20180507171248.patch (text/plain), 7.18 KB, created by Jonathan Bedard on 2018-05-07 17:12:48 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2018-05-07 17:12:48 PDT

Size: 7.18 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 231467)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,28 @@
>+2018-05-07  Jonathan Bedard  <jbedard@apple.com>
>+
>+        webkitpy: Clarify construction of VersionNameMap
>+        https://bugs.webkit.org/show_bug.cgi?id=185387
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The VersionNameMap should not be instantiated directly, only through
>+        the map() function so that it uses the apple_additions variation of the
>+        VersionNameMap if available.
>+
>+        * Scripts/webkitpy/common/version_name_map.py:
>+        (VersionNameMap.map): Move default platform definition from __init__.
>+        (VersionNameMap.__init__): No longer define platform by default.
>+        * Scripts/webkitpy/common/version_name_map_unittest.py:
>+        (VersionMapTestCase.test_default_system_platform): Use map static function
>+        instead of constructor.
>+        (VersionMapTestCase.test_mac_version_by_name): Ditto.
>+        (VersionMapTestCase.test_ios_version_by_name): Ditto.
>+        (VersionMapTestCase.test_mac_name_by_version): Ditto.
>+        (VersionMapTestCase.test_ios_name_by_version): Ditto.
>+        * Scripts/webkitpy/port/mac_unittest.py:
>+        (MacTest.test_factory_with_future_version): Use map static function instead
>+        of constructor.
>+
> 2018-05-07  Leo Balter  <leonardo.balter@gmail.com>
> 
>         Test262-Runner: Add base module to the local deps - unicore/Exact.pl
>Index: Tools/Scripts/webkitpy/common/version_name_map.py
>===================================================================
>--- Tools/Scripts/webkitpy/common/version_name_map.py	(revision 231463)
>+++ Tools/Scripts/webkitpy/common/version_name_map.py	(working copy)
>@@ -36,15 +36,17 @@ class VersionNameMap(object):
>     @staticmethod
>     @memoized
>     def map(platform=None):
>+        if platform is None:
>+            from webkitpy.common.system.systemhost import SystemHost
>+            platform = SystemHost().platform
>+
>         from webkitpy.port.config import apple_additions
>         if apple_additions():
>             return apple_additions().version_name_mapping(platform)
>         return VersionNameMap(platform=platform)
> 
>-    def __init__(self, platform=None):
>-        if platform is None:
>-            from webkitpy.common.system.systemhost import SystemHost
>-            platform = SystemHost().platform
>+    # Avoid instantiating directly since this will bypass the apple_additions check.
>+    def __init__(self, platform):
>         self.mapping = {}
> 
>         self.default_system_platform = platform.os_name
>Index: Tools/Scripts/webkitpy/common/version_name_map_unittest.py
>===================================================================
>--- Tools/Scripts/webkitpy/common/version_name_map_unittest.py	(revision 231463)
>+++ Tools/Scripts/webkitpy/common/version_name_map_unittest.py	(working copy)
>@@ -31,11 +31,11 @@ class VersionMapTestCase(unittest.TestCa
> 
>     def test_default_system_platform(self):
>         host = SystemHost()
>-        map = VersionNameMap(platform=host.platform)
>+        map = VersionNameMap.map(host.platform)
>         self.assertEqual(map.default_system_platform, host.platform.os_name)
> 
>     def test_mac_version_by_name(self):
>-        map = VersionNameMap()
>+        map = VersionNameMap.map()
>         self.assertEqual(('mac', Version(10, 12)), map.from_name('Sierra'))
>         self.assertEqual(('mac', Version(10, 12)), map.from_name('sierra'))
>         self.assertEqual(('mac', Version(10, 11)), map.from_name('El Capitan'))
>@@ -43,7 +43,7 @@ class VersionMapTestCase(unittest.TestCa
>         self.assertEqual(('mac', Version(10, 11)), map.from_name('el Capitan'))
> 
>     def test_ios_version_by_name(self):
>-        map = VersionNameMap()
>+        map = VersionNameMap.map()
>         self.assertEqual(('ios', Version(11)), map.from_name('iOS 11'))
>         self.assertEqual(('ios', Version(11)), map.from_name('ios11'))
>         self.assertEqual(('ios', Version(11)), map.from_name('iOS 11.2'))
>@@ -51,13 +51,13 @@ class VersionMapTestCase(unittest.TestCa
>         self.assertEqual(('ios', Version(11)), map.from_name('iOS11.2'))
> 
>     def test_mac_name_by_version(self):
>-        map = VersionNameMap()
>+        map = VersionNameMap.map()
>         self.assertEqual('Sierra', map.to_name(version=Version(10, 12), platform='mac'))
>         self.assertEqual('El Capitan', map.to_name(version=Version(10, 11), platform='mac'))
>         self.assertEqual('El Capitan', map.to_name(version=Version(10, 11, 3), platform='mac'))
> 
>     def test_ios_name_by_version(self):
>-        map = VersionNameMap()
>+        map = VersionNameMap.map()
>         self.assertEqual('iOS 11', map.to_name(version=Version(11), platform='ios'))
>         self.assertEqual('iOS 10', map.to_name(version=Version(10), platform='ios'))
>         self.assertEqual('iOS 10', map.to_name(version=Version(10, 3), platform='ios'))
>Index: Tools/Scripts/webkitpy/port/mac_unittest.py
>===================================================================
>--- Tools/Scripts/webkitpy/port/mac_unittest.py	(revision 231463)
>+++ Tools/Scripts/webkitpy/port/mac_unittest.py	(working copy)
>@@ -160,19 +160,19 @@ class MacTest(darwin_testcase.DarwinTest
>     def test_factory_with_future_version(self):
>         port = self.make_port(options=MockOptions(webkit_test_runner=True), os_version=MacTest.FUTURE_VERSION, os_name='mac', port_name='mac')
>         self.assertEqual(port.driver_name(), 'WebKitTestRunner')
>-        self.assertEqual(port.version_name(), VersionNameMap().to_name(MacPort.CURRENT_VERSION, platform=MacPort.port_name))
>+        self.assertEqual(port.version_name(), VersionNameMap.map().to_name(MacPort.CURRENT_VERSION, platform=MacPort.port_name))
> 
>         port = self.make_port(options=MockOptions(webkit_test_runner=False), os_version=MacTest.FUTURE_VERSION, os_name='mac', port_name='mac')
>         self.assertEqual(port.driver_name(), 'DumpRenderTree')
>-        self.assertEqual(port.version_name(), VersionNameMap().to_name(MacPort.CURRENT_VERSION, platform=MacPort.port_name))
>+        self.assertEqual(port.version_name(), VersionNameMap.map().to_name(MacPort.CURRENT_VERSION, platform=MacPort.port_name))
> 
>         port = self.make_port(options=MockOptions(webkit_test_runner=False), os_version=MacTest.FUTURE_VERSION, os_name='mac', port_name='mac-wk2')
>         self.assertEqual(port.driver_name(), 'WebKitTestRunner')
>-        self.assertEqual(port.version_name(), VersionNameMap().to_name(MacPort.CURRENT_VERSION, platform=MacPort.port_name))
>+        self.assertEqual(port.version_name(), VersionNameMap.map().to_name(MacPort.CURRENT_VERSION, platform=MacPort.port_name))
> 
>         port = self.make_port(options=MockOptions(webkit_test_runner=True), os_version=MacTest.FUTURE_VERSION, os_name='mac', port_name='mac-wk2')
>         self.assertEqual(port.driver_name(), 'WebKitTestRunner')
>-        self.assertEqual(port.version_name(), VersionNameMap().to_name(MacPort.CURRENT_VERSION, platform=MacPort.port_name))
>+        self.assertEqual(port.version_name(), VersionNameMap.map().to_name(MacPort.CURRENT_VERSION, platform=MacPort.port_name))
> 
>     def test_factory_with_future_version_and_apple_additions(self):
>         with port_testcase.bind_mock_apple_additions():

Actions: View | Formatted Diff | Diff

Attachments on bug 185387: 339775 | 340091