test: Update iOS e2e tests

Author: mykola-mokhnach

test/apps/TestApp.app.zip

@@ -0,0 +1,106 @@
+#!/usr/bin/env python
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+from dataclasses import dataclass
+from typing import Optional
+
+from appium.options.ios import XCUITestOptions
+
+# Returns abs path relative to this file and not cwd
+
+
+def PATH(p: str) -> str:
+    return os.path.abspath(os.path.join(os.path.dirname(__file__), p))
+
+
+def make_options(app: Optional[str] = None) -> XCUITestOptions:
+    """Get XCUITest options configured for iOS testing with parallel execution support."""
+    options = XCUITestOptions()
+
+    # Set basic iOS capabilities
+    options.device_name = iphone_device_name()
+    options.platform_version = os.getenv('IOS_VERSION') or '17.4'
+    options.allow_touch_id_enroll = True
+    options.wda_local_port = wda_port()
+    options.simple_is_visible_check = True
+
+    if app is not None:
+        options.app = PATH(os.path.join('../../..', 'apps', app))
+
+    local_prebuilt_wda = os.getenv('LOCAL_PREBUILT_WDA')
+    if local_prebuilt_wda:
+        options.use_preinstalled_wda = True
+        options.prebuilt_wda_path = local_prebuilt_wda
+
+    return options
+
+
+@dataclass
+class WorkerInfo:
+    """Information about the current test worker in parallel execution."""
+
+    worker_number: Optional[int]
+    total_workers: Optional[int]
+
+    @property
+    def is_parallel(self) -> bool:
+        """Check if running in parallel mode."""
+        return self.worker_number is not None and self.total_workers is not None
+
+
+def _get_worker_info() -> WorkerInfo:
+    """
+    Get current worker number and total worker count from pytest-xdist environment variables.
+
+    Returns:
+        WorkerInfo: Worker information or None values if not running in parallel
+    """
+    worker_number = os.getenv('PYTEST_XDIST_WORKER')
+    worker_count = os.getenv('PYTEST_XDIST_WORKER_COUNT')
+
+    if worker_number and worker_count:
+        # Extract number from worker string like 'gw0', 'gw1', etc.
+        try:
+            worker_num = int(worker_number.replace('gw', ''))
+            total_workers = int(worker_count)
+            return WorkerInfo(worker_number=worker_num, total_workers=total_workers)
+        except (ValueError, AttributeError):
+            pass
+
+    return WorkerInfo(worker_number=None, total_workers=None)
+
+
+def wda_port() -> int:
+    """
+    Get a unique WDA port for the current worker.
+    Uses base port 8100 and increments by worker number.
+    """
+    worker_info = _get_worker_info()
+    return 8100 + (worker_info.worker_number or 0)
+
+
+def iphone_device_name() -> str:
+    """
+    Get a unique device name for the current worker.
+    Uses the base device name and appends the port number for uniqueness.
+    """
+    prefix = os.getenv('IPHONE_MODEL') or 'iPhone 15 Plus'
+    worker_info = _get_worker_info()
+
+    if worker_info.is_parallel:
+        port = wda_port()
+        return f'{prefix} - {port}'
+
+    return prefix

test/apps/UICatalog.app.zip

@@ -13,62 +13,67 @@
 # limitations under the License.
 
 import time
+from typing import TYPE_CHECKING, Generator
+
+import pytest
 
 from appium import webdriver
-from appium.options.common import AppiumOptions
 from appium.webdriver.client_config import AppiumClientConfig
 from test.helpers.constants import SERVER_URL_BASE
 
-from .helper.desired_capabilities import get_desired_capabilities
-
-
-class TestSafari:
-    def setup_method(self) -> None:
-        caps = get_desired_capabilities()
-        caps.update(
-            {
-                'bundleId': 'com.apple.mobilesafari',
-                'nativeWebTap': True,
-                'safariIgnoreFraudWarning': True,
-                'webviewConnectTimeout': 100000,
-            }
-        )
-        client_config = AppiumClientConfig(remote_server_addr=SERVER_URL_BASE)
-        client_config.timeout = 600
-        self.driver = webdriver.Remote(options=AppiumOptions().load_capabilities(caps), client_config=client_config)
-
-        # Fresh iOS 17.4 simulator may not show up the webview context with "safari"
-        # after a fresh simlator instance creation.
-        # Re-launch the process could be a workaround in my debugging.
-        self.driver.terminate_app('com.apple.mobilesafari')
-        self.driver.activate_app('com.apple.mobilesafari')
-
-    def teardown_method(self) -> None:
-        self.driver.quit()
-
-    def test_context(self) -> None:
-        contexts = self.driver.contexts
-        assert 'NATIVE_APP' == contexts[0]
-        assert contexts[1].startswith('WEBVIEW_')
-        self.driver.switch_to.context(contexts[1])
-        assert 'WEBVIEW_' in self.driver.current_context
-
-    def test_get(self) -> None:
-        ok = False
-        contexts = self.driver.contexts
-        for context in contexts:
-            if context.startswith('WEBVIEW_'):
-                self.driver.switch_to.context(context)
-                ok = True
-                break
-
-        if ok is False:
-            assert False, 'Could not set WEBVIEW context'
-
-        self.driver.get('http://google.com')
-        for _ in range(5):
-            time.sleep(0.5)
-            if 'Google' == self.driver.title:
-                return
-
-        assert False, 'The title was wrong'
+from .helper.options import make_options
+
+if TYPE_CHECKING:
+    from appium.webdriver.webdriver import WebDriver
+
+
+@pytest.fixture
+def driver() -> Generator['WebDriver', None, None]:
+    """Create and configure Safari driver for testing."""
+    options = make_options()
+    options.bundle_id = 'com.apple.mobilesafari'
+    options.native_web_tap = True
+    options.safari_ignore_fraud_warning = True
+    options.webview_connect_timeout = 100000
+
+    client_config = AppiumClientConfig(remote_server_addr=SERVER_URL_BASE)
+    client_config.timeout = 600
+    driver = webdriver.Remote(options=options, client_config=client_config)
+
+    # Fresh iOS 17.4 simulator may not show up the webview context with "safari"
+    # after a fresh simlator instance creation.
+    # Re-launch the process could be a workaround in my debugging.
+    driver.terminate_app('com.apple.mobilesafari')
+    driver.activate_app('com.apple.mobilesafari')
+
+    yield driver
+
+    driver.quit()
+
+
+def test_context(driver: 'WebDriver') -> None:
+    """Test Safari context switching."""
+    contexts = driver.contexts
+    assert 'NATIVE_APP' == contexts[0]
+    assert contexts[1].startswith('WEBVIEW_')
+    driver.switch_to.context(contexts[1])
+    assert 'WEBVIEW_' in driver.current_context
+
+
+def test_navigation(driver: 'WebDriver') -> None:
+    """Test Safari navigation to Google."""
+    contexts = driver.contexts
+    for context in contexts:
+        if context.startswith('WEBVIEW_'):
+            driver.switch_to.context(context)
+            break
+    else:
+        pytest.fail('Could not set WEBVIEW context')
+
+    driver.get('http://google.com')
+    for _ in range(5):
+        time.sleep(0.5)
+        if 'Google' == driver.title:
+            return
+    else:
+        pytest.fail('The title was wrong')