Commit b0b8648d authored by smut's avatar smut Committed by Commit bot

[Telemetry] Add recognition for OS X 10.10 Yosemite

BUG=409919

Review URL: https://codereview.chromium.org/533443003

Cr-Commit-Position: refs/heads/master@{#293017}
parent a3182da9
...@@ -143,6 +143,8 @@ class MacPlatformBackend(posix_platform_backend.PosixPlatformBackend): ...@@ -143,6 +143,8 @@ class MacPlatformBackend(posix_platform_backend.PosixPlatformBackend):
return platform_backend.MOUNTAINLION return platform_backend.MOUNTAINLION
if os_version.startswith('13.'): if os_version.startswith('13.'):
return platform_backend.MAVERICKS return platform_backend.MAVERICKS
if os_version.startswith('14.'):
return platform_backend.YOSEMITE
raise NotImplementedError('Unknown mac version %s.' % os_version) raise NotImplementedError('Unknown mac version %s.' % os_version)
......
...@@ -12,10 +12,13 @@ from telemetry.core.platform import platform_backend ...@@ -12,10 +12,13 @@ from telemetry.core.platform import platform_backend
class MacPlatformBackendTest(unittest.TestCase): class MacPlatformBackendTest(unittest.TestCase):
def testVersionCamparison(self): def testVersionCamparison(self):
self.assertGreater(platform_backend.YOSEMITE,
platform_backend.MAVERICKS)
self.assertGreater(platform_backend.MAVERICKS, self.assertGreater(platform_backend.MAVERICKS,
platform_backend.SNOWLEOPARD) platform_backend.SNOWLEOPARD)
self.assertGreater(platform_backend.LION, self.assertGreater(platform_backend.LION,
platform_backend.LEOPARD) platform_backend.LEOPARD)
self.assertEqual(platform_backend.YOSEMITE, 'yosemite')
self.assertEqual(platform_backend.MAVERICKS, 'mavericks') self.assertEqual(platform_backend.MAVERICKS, 'mavericks')
self.assertEqual('%s2' % platform_backend.MAVERICKS, 'mavericks2') self.assertEqual('%s2' % platform_backend.MAVERICKS, 'mavericks2')
self.assertEqual(''.join([platform_backend.MAVERICKS, '2']), self.assertEqual(''.join([platform_backend.MAVERICKS, '2']),
......
...@@ -34,11 +34,12 @@ VISTA = OSVersion('vista', 6.0) ...@@ -34,11 +34,12 @@ VISTA = OSVersion('vista', 6.0)
WIN7 = OSVersion('win7', 6.1) WIN7 = OSVersion('win7', 6.1)
WIN8 = OSVersion('win8', 6.2) WIN8 = OSVersion('win8', 6.2)
LEOPARD = OSVersion('leopard', 10.5) LEOPARD = OSVersion('leopard', 105)
SNOWLEOPARD = OSVersion('snowleopard', 10.6) SNOWLEOPARD = OSVersion('snowleopard', 106)
LION = OSVersion('lion', 10.7) LION = OSVersion('lion', 107)
MOUNTAINLION = OSVersion('mountainlion', 10.8) MOUNTAINLION = OSVersion('mountainlion', 108)
MAVERICKS = OSVersion('mavericks', 10.9) MAVERICKS = OSVersion('mavericks', 109)
YOSEMITE = OSVersion('yosemite', 1010)
class PlatformBackend(object): class PlatformBackend(object):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment