Commit 0745b831 authored by Ilia Samsonov's avatar Ilia Samsonov Committed by Commit Bot

Remove retired mac versions from blinkpy.

This cl removes blinkpy support for Mac10.10, Mac10.11, and Mac Retina.
blink web tests for these versions has been removed from waterfall.

Bug: 1077312, 1107003, 1114680
Change-Id: I819d0bf7316119b2f5bc127f6eda1deaba7e0cd9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2343548
Commit-Queue: Ilia Samsonov <isamsonov@google.com>
Reviewed-by: default avatarXianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796476}
parent 231af1e5
...@@ -83,22 +83,14 @@ class BaselineOptimizerTest(unittest.TestCase): ...@@ -83,22 +83,14 @@ class BaselineOptimizerTest(unittest.TestCase):
'port_name': 'mac-mac10.12', 'port_name': 'mac-mac10.12',
'specifiers': ['Mac10.12', 'Release'] 'specifiers': ['Mac10.12', 'Release']
}, },
'Fake Test Mac10.11': {
'port_name': 'mac-mac10.11',
'specifiers': ['Mac10.11', 'Release']
},
'Fake Test Mac10.10': {
'port_name': 'mac-mac10.10',
'specifiers': ['Mac10.10', 'Release']
},
}) })
# Note: this is a pre-assumption of the tests in this file. If this # Note: this is a pre-assumption of the tests in this file. If this
# assertion fails, port configurations are likely changed, and the # assertion fails, port configurations are likely changed, and the
# tests need to be adjusted accordingly. # tests need to be adjusted accordingly.
self.assertEqual( self.assertEqual(
sorted(self.host.port_factory.all_port_names()), [ sorted(self.host.port_factory.all_port_names()), [
'linux-trusty', 'mac-mac10.10', 'mac-mac10.11', 'mac-mac10.12', 'linux-trusty', 'mac-mac10.12', 'mac-mac10.13', 'mac-mac10.14',
'mac-mac10.13', 'mac-mac10.14', 'mac-mac10.15', 'win-win10' 'mac-mac10.15', 'win-win10'
]) ])
def _assert_optimization(self, def _assert_optimization(self,
...@@ -201,18 +193,18 @@ class BaselineOptimizerTest(unittest.TestCase): ...@@ -201,18 +193,18 @@ class BaselineOptimizerTest(unittest.TestCase):
self._assert_optimization({ self._assert_optimization({
'platform/mac': '1', 'platform/mac': '1',
'platform/linux': '1', 'platform/linux': '1',
'platform/mac-mac10.11': '1', 'platform/mac-mac10.14': '1',
}, { }, {
'platform/mac': '1', 'platform/mac': '1',
'platform/linux': '1', 'platform/linux': '1',
}) })
def test_local_optimization_skipping_a_port_in_the_middle(self): def test_local_optimization_skipping_a_port_in_the_middle(self):
# mac-mac10.10 -> mac-mac10.11 -> mac # mac-mac10.13 -> mac-mac10.14 -> mac
self._assert_optimization({ self._assert_optimization({
'platform/mac': '1', 'platform/mac': '1',
'platform/linux': '1', 'platform/linux': '1',
'platform/mac-mac10.10': '1', 'platform/mac-mac10.13': '1',
}, { }, {
'platform/mac': '1', 'platform/mac': '1',
'platform/linux': '1', 'platform/linux': '1',
......
...@@ -14,16 +14,6 @@ ...@@ -14,16 +14,6 @@
"port_name": "linux-trusty", "port_name": "linux-trusty",
"specifiers": ["Trusty", "Debug"] "specifiers": ["Trusty", "Debug"]
}, },
"Mac10.10 Tests": {
"master": "chromium.mac",
"port_name": "mac-mac10.10",
"specifiers": ["Mac10.10", "Release"]
},
"Mac10.11 Tests": {
"master": "chromium.mac",
"port_name": "mac-mac10.11",
"specifiers": ["Mac10.11", "Release"]
},
"Mac10.12 Tests": { "Mac10.12 Tests": {
"master": "chromium.mac", "master": "chromium.mac",
"port_name": "mac-mac10.12", "port_name": "mac-mac10.12",
...@@ -72,18 +62,6 @@ ...@@ -72,18 +62,6 @@
"has_webdriver_tests": true, "has_webdriver_tests": true,
"is_try_builder": true "is_try_builder": true
}, },
"mac10.10-blink-rel": {
"master": "tryserver.blink",
"port_name": "mac-mac10.10",
"specifiers": ["Mac10.10", "Release"],
"is_try_builder": true
},
"mac10.11-blink-rel": {
"master": "tryserver.blink",
"port_name": "mac-mac10.11",
"specifiers": ["Mac10.11", "Release"],
"is_try_builder": true
},
"mac10.12-blink-rel": { "mac10.12-blink-rel": {
"master": "tryserver.blink", "master": "tryserver.blink",
"port_name": "mac-mac10.12", "port_name": "mac-mac10.12",
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
class MockPlatformInfo(object): class MockPlatformInfo(object):
def __init__(self, def __init__(self,
os_name='mac', os_name='mac',
os_version='mac10.10', os_version='mac10.14',
linux_distribution=None, linux_distribution=None,
is_highdpi=False): is_highdpi=False):
self.os_name = os_name self.os_name = os_name
......
...@@ -131,12 +131,6 @@ class Port(object): ...@@ -131,12 +131,6 @@ class Port(object):
CONTENT_SHELL_NAME = 'content_shell' CONTENT_SHELL_NAME = 'content_shell'
ALL_SYSTEMS = ( ALL_SYSTEMS = (
# FIXME: We treat Retina (High-DPI) devices as if they are running a different
# a different operating system version. This isn't accurate, but will
# work until we need to test and support baselines across multiple OS versions.
('retina', 'x86'),
('mac10.10', 'x86'),
('mac10.11', 'x86'),
('mac10.12', 'x86'), ('mac10.12', 'x86'),
('mac10.13', 'x86'), ('mac10.13', 'x86'),
('mac10.14', 'x86'), ('mac10.14', 'x86'),
...@@ -151,8 +145,7 @@ class Port(object): ...@@ -151,8 +145,7 @@ class Port(object):
CONFIGURATION_SPECIFIER_MACROS = { CONFIGURATION_SPECIFIER_MACROS = {
'mac': 'mac':
['retina', 'mac10.10', 'mac10.11', 'mac10.12', 'mac10.13', 'mac10.14', ['mac10.12', 'mac10.13', 'mac10.14', 'mac10.15'],
'mac10.15'],
'win': ['win7', 'win10'], 'win': ['win7', 'win10'],
'linux': ['trusty'], 'linux': ['trusty'],
'fuschia': ['fuchsia'], 'fuschia': ['fuchsia'],
......
...@@ -89,7 +89,7 @@ class BrowserTestWinTest(_BrowserTestTestCaseMixin, ...@@ -89,7 +89,7 @@ class BrowserTestWinTest(_BrowserTestTestCaseMixin,
class BrowserTestMacTest(_BrowserTestTestCaseMixin, class BrowserTestMacTest(_BrowserTestTestCaseMixin,
port_testcase.PortTestCase): port_testcase.PortTestCase):
os_name = 'mac' os_name = 'mac'
os_version = 'mac10.11' os_version = 'mac10.14'
port_name = 'mac' port_name = 'mac'
port_maker = browser_test.BrowserTestMacPort port_maker = browser_test.BrowserTestMacPort
driver_name_endswith = 'browser_tests' driver_name_endswith = 'browser_tests'
......
...@@ -62,7 +62,7 @@ class FactoryTest(unittest.TestCase): ...@@ -62,7 +62,7 @@ class FactoryTest(unittest.TestCase):
self.assert_port( self.assert_port(
port_name='mac', port_name='mac',
os_name='mac', os_name='mac',
os_version='mac10.11', os_version='mac10.14',
cls=mac.MacPort) cls=mac.MacPort)
def test_linux(self): def test_linux(self):
......
...@@ -35,8 +35,7 @@ _log = logging.getLogger(__name__) ...@@ -35,8 +35,7 @@ _log = logging.getLogger(__name__)
class MacPort(base.Port): class MacPort(base.Port):
SUPPORTED_VERSIONS = ('mac10.10', 'mac10.11', 'mac10.12', 'mac10.13', SUPPORTED_VERSIONS = ('mac10.12', 'mac10.13', 'mac10.14', 'mac10.15')
'mac10.14', 'mac10.15', 'retina')
port_name = 'mac' port_name = 'mac'
# FIXME: We treat Retina (High-DPI) devices as if they are running a # FIXME: We treat Retina (High-DPI) devices as if they are running a
...@@ -52,9 +51,6 @@ class MacPort(base.Port): ...@@ -52,9 +51,6 @@ class MacPort(base.Port):
FALLBACK_PATHS['mac10.14'] = ['mac-mac10.14'] + FALLBACK_PATHS['mac10.15'] FALLBACK_PATHS['mac10.14'] = ['mac-mac10.14'] + FALLBACK_PATHS['mac10.15']
FALLBACK_PATHS['mac10.13'] = ['mac-mac10.13'] + FALLBACK_PATHS['mac10.14'] FALLBACK_PATHS['mac10.13'] = ['mac-mac10.13'] + FALLBACK_PATHS['mac10.14']
FALLBACK_PATHS['mac10.12'] = ['mac-mac10.12'] + FALLBACK_PATHS['mac10.13'] FALLBACK_PATHS['mac10.12'] = ['mac-mac10.12'] + FALLBACK_PATHS['mac10.13']
FALLBACK_PATHS['mac10.11'] = ['mac-mac10.11'] + FALLBACK_PATHS['mac10.12']
FALLBACK_PATHS['mac10.10'] = ['mac-mac10.10'] + FALLBACK_PATHS['mac10.11']
FALLBACK_PATHS['retina'] = ['mac-retina'] + FALLBACK_PATHS['mac10.13']
CONTENT_SHELL_NAME = 'Content Shell' CONTENT_SHELL_NAME = 'Content Shell'
......
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