Attachment 371205 Details for Bug 198492 – Patch

[patch] Patch

bug-198492-20190603124831.patch (text/plain), 4.71 KB, created by Jonathan Bedard on 2019-06-03 12:48:32 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2019-06-03 12:48:32 PDT

Size: 4.71 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 246043)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2019-06-03  Jonathan Bedard  <jbedard@apple.com>
>+
>+        webkitpy: Add macOS Catalina, iOS 13
>+        https://bugs.webkit.org/show_bug.cgi?id=198492
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitpy/common/version_name_map.py:
>+        (VersionNameMap.__init__): Add Catalina, iOS 13.
>+        * Scripts/webkitpy/common/version_name_map_unittest.py:
>+        (VersionMapTestCase.test_mac_version_by_name):
>+        (VersionMapTestCase.test_mac_name_by_version):
>+        (VersionMapTestCase.test_ios_name_by_version):
>+        * Scripts/webkitpy/layout_tests/models/test_expectations.py:
>+        (TestExpectationParser):
>+
> 2019-06-02  Andy Estes  <aestes@apple.com>
> 
>         Memory-cached main resources continue to load after the client decides a content policy of PolicyAction::Download
>Index: Tools/Scripts/webkitpy/common/version_name_map.py
>===================================================================
>--- Tools/Scripts/webkitpy/common/version_name_map.py	(revision 246042)
>+++ Tools/Scripts/webkitpy/common/version_name_map.py	(working copy)
>@@ -60,10 +60,11 @@ class VersionNameMap(object):
>                 'Sierra': Version(10, 12),
>                 'High Sierra': Version(10, 13),
>                 'Mojave': Version(10, 14),
>+                'Catalina': Version(10, 15),
>             },
>-            'ios': self._automap_to_major_version('iOS', minimum=Version(10), maximum=Version(12)),
>-            'tvos': self._automap_to_major_version('tvOS', minimum=Version(10), maximum=Version(12)),
>-            'watchos': self._automap_to_major_version('watchOS', minimum=Version(1), maximum=Version(5)),
>+            'ios': self._automap_to_major_version('iOS', minimum=Version(10), maximum=Version(13)),
>+            'tvos': self._automap_to_major_version('tvOS', minimum=Version(10), maximum=Version(13)),
>+            'watchos': self._automap_to_major_version('watchOS', minimum=Version(1), maximum=Version(6)),
>             'win': {
>                 'Win10': Version(10),
>                 '8.1': Version(6, 3),
>Index: Tools/Scripts/webkitpy/common/version_name_map_unittest.py
>===================================================================
>--- Tools/Scripts/webkitpy/common/version_name_map_unittest.py	(revision 246042)
>+++ Tools/Scripts/webkitpy/common/version_name_map_unittest.py	(working copy)
>@@ -36,6 +36,8 @@ class VersionMapTestCase(unittest.TestCa
> 
>     def test_mac_version_by_name(self):
>         map = VersionNameMap()
>+        self.assertEqual(('mac', Version(10, 15)), map.from_name('Catalina'))
>+        self.assertEqual(('mac', Version(10, 15)), map.from_name('catalina'))
>         self.assertEqual(('mac', Version(10, 14)), map.from_name('Mojave'))
>         self.assertEqual(('mac', Version(10, 14)), map.from_name('mojave'))
>         self.assertEqual(('mac', Version(10, 13)), map.from_name('High Sierra'))
>@@ -57,6 +59,7 @@ class VersionMapTestCase(unittest.TestCa
> 
>     def test_mac_name_by_version(self):
>         map = VersionNameMap()
>+        self.assertEqual('Catalina', map.to_name(version=Version(10, 15), platform='mac'))
>         self.assertEqual('Mojave', map.to_name(version=Version(10, 14), platform='mac'))
>         self.assertEqual('High Sierra', map.to_name(version=Version(10, 13), platform='mac'))
>         self.assertEqual('High Sierra', map.to_name(version=Version(10, 13, 3), platform='mac'))
>@@ -66,6 +69,7 @@ class VersionMapTestCase(unittest.TestCa
> 
>     def test_ios_name_by_version(self):
>         map = VersionNameMap()
>+        self.assertEqual('iOS 13', map.to_name(version=Version(13), platform='ios'))
>         self.assertEqual('iOS 12', map.to_name(version=Version(12), platform='ios'))
>         self.assertEqual('iOS 11', map.to_name(version=Version(11), platform='ios'))
>         self.assertEqual('iOS 10', map.to_name(version=Version(10), platform='ios'))
>Index: Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
>===================================================================
>--- Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py	(revision 246042)
>+++ Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py	(working copy)
>@@ -226,7 +226,7 @@ class TestExpectationParser(object):
>     # FIXME: Update the original modifiers and remove this once the old syntax is gone.
>     _configuration_tokens_list = [
>         'SnowLeopard', 'Lion', 'MountainLion', 'Mavericks', 'Yosemite', 'ElCapitan', # Legacy macOS
>-        'Mac', 'Sierra', 'HighSierra', 'Mojave',
>+        'Mac', 'Sierra', 'HighSierra', 'Mojave', 'Catalina',
>         'Win', 'XP', 'Vista', 'Win7',
>         'Linux',
>         'Android',

Actions: View | Formatted Diff | Diff

Attachments on bug 198492: 371205 | 372150 | 372151 | 372152 | 372153