Support macOS 10.15 in blinkpy.

Also remove support for Mac OS X 10.9, which is no longer supported.

Bug: 998881
Change-Id: I8aca9c7e43ec2555f4b19f77c94db8ecabb75f2f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1776218Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#691779}

third_party/blink/tools/blinkpy/common/system/platform_info.py

@@ -147,10 +147,7 @@ class PlatformInfo(object):
 
     def _determine_mac_version(self, mac_version_string):
         minor_release = int(mac_version_string.split('.')[1])
-        assert 9 <= minor_release <= 14, 'Unsupported mac OS version: %s' % mac_version_string
-        if minor_release == 9:
-            # 10.9 is only partially supported; we pretend we're 10.10.
-            return 'mac10.10'
+        assert 10 <= minor_release <= 15, 'Unsupported mac OS version: %s' % mac_version_string
         return 'mac10.%d' % minor_release
 
     def _determine_linux_version(self, _):

third_party/blink/tools/blinkpy/common/system/platform_info_unittest.py

@@ -135,11 +135,12 @@ class TestPlatformInfo(unittest.TestCase):
     def test_os_version(self):
         with self.assertRaises(AssertionError):
             self.make_info(fake_sys('darwin'), fake_platform('10.6.3'))
-        self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.9.0')).os_version, 'mac10.10')
         self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.10.0')).os_version, 'mac10.10')
         self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.11.0')).os_version, 'mac10.11')
         self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.12.0')).os_version, 'mac10.12')
         self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.13.0')).os_version, 'mac10.13')
+        self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.14.0')).os_version, 'mac10.14')
+        self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.15.0')).os_version, 'mac10.15')
         with self.assertRaises(AssertionError):
             self.make_info(fake_sys('darwin'), fake_platform('10.20.0'))
 

third_party/blink/tools/blinkpy/web_tests/port/mac.py

@@ -37,7 +37,7 @@ _log = logging.getLogger(__name__)
 
 
 class MacPort(base.Port):
-    SUPPORTED_VERSIONS = ('mac10.10', 'mac10.11', 'mac10.12', 'mac10.13', 'mac10.14', 'retina')
+    SUPPORTED_VERSIONS = ('mac10.10', 'mac10.11', 'mac10.12', 'mac10.13', 'mac10.14', 'mac10.15', 'retina')
     port_name = 'mac'
 
     # FIXME: We treat Retina (High-DPI) devices as if they are running a
@@ -49,6 +49,7 @@ class MacPort(base.Port):
 
     FALLBACK_PATHS = {}
 
+    FALLBACK_PATHS['mac10.15'] = ['mac']
     FALLBACK_PATHS['mac10.14'] = ['mac']
     FALLBACK_PATHS['mac10.13'] = ['mac']
     FALLBACK_PATHS['mac10.12'] = ['mac-mac10.12'] + FALLBACK_PATHS['mac10.13']