Commit 53ce7285 authored by Robert Ma's avatar Robert Ma Committed by Commit Bot

Revert "Add an iOS port to blinkpy"

This reverts commit ef93a320.

Reason for revert: suspected to be the root cause of crbug.com/1115767

Original change's description:
> Add an iOS port to blinkpy
>
> This adds an iOS port to blinkpy to allow sharing logic for running
> WPTs using 'wpt run'. In particular, the goal is to share logic for
> managing expectations and for running tests on a bot.
>
> Change-Id: I6e9b5bddc1f20494b7d9124a7027777c53e38e93
> Bug: 673423
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1739390
> Reviewed-by: Robert Ma <robertma@chromium.org>
> Commit-Queue: Ali Juma <ajuma@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#684770}

TBR=ajuma@chromium.org,robertma@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1115767, 673423
Change-Id: Ib1dba6a03a77160fc2641b565676d8809004827a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2354273
Commit-Queue: Robert Ma <robertma@chromium.org>
Reviewed-by: default avatarRobert Ma <robertma@chromium.org>
Reviewed-by: default avatarAli Juma <ajuma@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797744}
parent e9683c1b
...@@ -29,13 +29,11 @@ ...@@ -29,13 +29,11 @@
import copy import copy
import logging import logging
import itertools
import re import re
from collections import defaultdict from collections import defaultdict
from collections import OrderedDict from collections import OrderedDict
from blinkpy.common import path_finder
from blinkpy.common.memoized import memoized from blinkpy.common.memoized import memoized
from blinkpy.web_tests.models import typ_types from blinkpy.web_tests.models import typ_types
...@@ -46,8 +44,7 @@ _log = logging.getLogger(__name__) ...@@ -46,8 +44,7 @@ _log = logging.getLogger(__name__)
SPECIAL_PREFIXES = ('# tags:', '# results:', '# conflicts_allowed:') SPECIAL_PREFIXES = ('# tags:', '# results:', '# conflicts_allowed:')
_PLATFORM_TOKENS_LIST = [ _PLATFORM_TOKENS_LIST = [
'Android', 'Fuchsia', 'IOS', 'IOS12.2', 'IOS13.0', 'Linux', 'Mac', 'Android', 'Fuchsia', 'Linux', 'Mac', 'Mac10.12', 'Mac10.13', 'Mac10.14',
'Mac10.10', 'Mac10.11', 'Retina', 'Mac10.12', 'Mac10.13', 'Mac10.14',
'Win', 'Win7', 'Win10' 'Win', 'Win7', 'Win10'
] ]
......
...@@ -139,17 +139,13 @@ class Port(object): ...@@ -139,17 +139,13 @@ class Port(object):
('win10', 'x86'), ('win10', 'x86'),
('trusty', 'x86_64'), ('trusty', 'x86_64'),
('fuchsia', 'x86_64'), ('fuchsia', 'x86_64'),
('ios12.2', 'x86_64'),
('ios13.0', 'x86_64'),
) )
CONFIGURATION_SPECIFIER_MACROS = { CONFIGURATION_SPECIFIER_MACROS = {
'mac': 'mac': ['mac10.12', 'mac10.13', 'mac10.14', 'mac10.15'],
['mac10.12', 'mac10.13', 'mac10.14', 'mac10.15'],
'win': ['win7', 'win10'], 'win': ['win7', 'win10'],
'linux': ['trusty'], 'linux': ['trusty'],
'fuschia': ['fuchsia'], 'fuschia': ['fuchsia'],
'ios': ['ios12.2', 'ios13.0'],
} }
# List of ports open on the host that the tests will connect to. When tests # List of ports open on the host that the tests will connect to. When tests
......
...@@ -39,7 +39,6 @@ class PortFactory(object): ...@@ -39,7 +39,6 @@ class PortFactory(object):
PORT_CLASSES = ( PORT_CLASSES = (
'android.AndroidPort', 'android.AndroidPort',
'fuchsia.FuchsiaPort', 'fuchsia.FuchsiaPort',
'ios.IOSPort',
'linux.LinuxPort', 'linux.LinuxPort',
'mac.MacPort', 'mac.MacPort',
'mock_drt.MockDRTPort', 'mock_drt.MockDRTPort',
......
# Copyright (C) 2019 Google Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""Chromium iOS implementation of the Port interface."""
import logging
from blinkpy.web_tests.port import base
_log = logging.getLogger(__name__)
class IOSPort(base.Port):
SUPPORTED_VERSIONS = ('ios12.2', 'ios13.0')
port_name = 'ios'
FALLBACK_PATHS = {}
FALLBACK_PATHS['ios13.0'] = ['ios']
FALLBACK_PATHS['ios12.2'] = ['ios12.2', 'ios']
def __init__(self, host, port_name, **kwargs):
super(IOSPort, self).__init__(host, port_name, **kwargs)
self._architecture = 'x86_64'
self._version = port_name[port_name.index('ios-') + len('ios-'):]
assert self._version in self.SUPPORTED_VERSIONS
def operating_system(self):
return 'ios'
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Slow Skip ] # results: [ Timeout Crash Pass Failure Slow Skip ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Slow Skip ] # results: [ Timeout Crash Pass Failure Slow Skip ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Slow Skip ] # results: [ Timeout Crash Pass Failure Slow Skip ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Slow Skip ] # results: [ Timeout Crash Pass Failure Slow Skip ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Slow Skip ] # results: [ Timeout Crash Pass Failure Slow Skip ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Slow Skip ] # results: [ Timeout Crash Pass Failure Slow Skip ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Slow Skip ] # results: [ Timeout Crash Pass Failure Slow Skip ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Slow Skip ] # results: [ Timeout Crash Pass Failure Slow Skip ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Slow Skip ] # results: [ Timeout Crash Pass Failure Slow Skip ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# results: [ Timeout Crash Pass Failure Slow Skip ] # results: [ Timeout Crash Pass Failure Slow Skip ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Slow Skip ] # results: [ Timeout Crash Pass Failure Slow Skip ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Slow Skip ] # results: [ Timeout Crash Pass Failure Slow Skip ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Slow Skip ] # results: [ Timeout Crash Pass Failure Slow Skip ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Slow Skip ] # results: [ Timeout Crash Pass Failure Slow Skip ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Slow Skip ] # results: [ Timeout Crash Pass Failure Slow Skip ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Mac10.14 Mac10.15 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Mac10.14 Mac10.15 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Skip ] # results: [ Timeout Crash Pass Failure Skip ]
...@@ -3324,8 +3324,6 @@ crbug.com/626703 [ Win10 ] external/wpt/fetch/api/redirect/redirect-count.any.wo ...@@ -3324,8 +3324,6 @@ crbug.com/626703 [ Win10 ] external/wpt/fetch/api/redirect/redirect-count.any.wo
crbug.com/626703 [ Win10 ] external/wpt/fetch/api/redirect/redirect-count.any.html [ Timeout ] crbug.com/626703 [ Win10 ] external/wpt/fetch/api/redirect/redirect-count.any.html [ Timeout ]
crbug.com/626703 external/wpt/css/cssom-view/scroll-behavior-smooth.html [ Timeout Crash ] crbug.com/626703 external/wpt/css/cssom-view/scroll-behavior-smooth.html [ Timeout Crash ]
crbug.com/626703 [ IOS ] external/wpt/websockets/Create-Secure-extensions-empty.any.html [ Timeout ]
crbug.com/626703 [ IOS ] external/wpt/websockets/Create-Secure-extensions-empty.any.worker.html [ Timeout ]
crbug.com/626703 external/wpt/html/browsers/history/joint-session-history/joint-session-history-remove-iframe.html [ Timeout ] crbug.com/626703 external/wpt/html/browsers/history/joint-session-history/joint-session-history-remove-iframe.html [ Timeout ]
crbug.com/626703 external/wpt/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-008.html [ Failure ] crbug.com/626703 external/wpt/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-008.html [ Failure ]
crbug.com/626703 external/wpt/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-006.html [ Failure ] crbug.com/626703 external/wpt/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-006.html [ Failure ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Skip ] # results: [ Skip ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Slow Skip ] # results: [ Timeout Crash Pass Failure Slow Skip ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Slow Skip ] # results: [ Timeout Crash Pass Failure Slow Skip ]
......
# tags: [ Android Fuchsia IOS IOS12.2 IOS13.0 Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ] # tags: [ Android Fuchsia Linux Mac Mac10.12 Mac10.13 Win Win7 Win10 ]
# tags: [ Release Debug ] # tags: [ Release Debug ]
# results: [ Timeout Crash Pass Failure Slow Skip RetryOnFailure ] # results: [ Timeout Crash Pass Failure Slow Skip RetryOnFailure ]
......
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