PyPI - gridfleet-testkit - Versions diffs - 0.9.5__tar.gz → 0.10.0__tar.gz - Mend

gridfleet-testkit 0.9.5tar.gz → 0.10.0tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (37) hide show

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/.gitignore RENAMED Viewed

@@ -55,6 +55,7 @@ docs/superpowers/
 .claude/
 .repowise/
 .mcp.json
+graphify-out/
 # Local-only device-state live test harness (not committed)
 scripts/state-testing/

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/CHANGELOG.md RENAMED Viewed

@@ -2,6 +2,32 @@
 All notable changes to the GridFleet testkit (`gridfleet-testkit` on PyPI) are documented here.
+## [0.10.0](https://github.com/quidow/gridfleet/compare/gridfleet-testkit-v0.9.5...gridfleet-testkit-v0.10.0) (2026-06-07)
+### ⚠ BREAKING CHANGES
+* **testkit:** bind sessions to runs via the run-scoped grid url
+### Features
+* **testkit:** bind sessions to runs via the run-scoped grid url ([da34f10](https://github.com/quidow/gridfleet/commit/da34f10f095ed74b2733c0746f11632039bd109e))
+### Bug Fixes
+* **testkit:** route the pytest plugin driver fixture through the run-scoped url ([d976c8a](https://github.com/quidow/gridfleet/commit/d976c8afb7c10ade85b3b03fb1c7d40756e952ca))
+### Dependencies
+* **deps:** bump ruff in /testkit in the python-dependencies group ([#513](https://github.com/quidow/gridfleet/issues/513)) ([f7e8fb9](https://github.com/quidow/gridfleet/commit/f7e8fb92da993155852e328dd2e8e174fe93bba7))
+### Documentation
+* **docs:** sweep selenium grid references for router architecture ([d086bcb](https://github.com/quidow/gridfleet/commit/d086bcb7c1619fb21cdf5e59499ab8221b18a0e4))
 ## [0.9.5](https://github.com/quidow/gridfleet/compare/gridfleet-testkit-v0.9.4...gridfleet-testkit-v0.9.5) (2026-06-04)

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gridfleet-testkit
-Version: 0.9.5
+Version: 0.10.0
 Summary: Supported pytest and run-orchestration helpers for GridFleet integrations
 Project-URL: Homepage, https://github.com/quidow/gridfleet
 Project-URL: Repository, https://github.com/quidow/gridfleet
@@ -68,7 +68,7 @@ Description-Content-Type: text/markdown
 ## What It Does Not Own
 - Appium server installation or host-level driver setup
-- Selenium Grid lifecycle
+- WebDriver router lifecycle
 - Device registration, verification, or readiness setup
 - CI orchestration beyond the documented client helpers
@@ -107,15 +107,15 @@ The package supports Python 3.10 through 3.14.
 | Variable | Default | Meaning |
 | --- | --- | --- |
-| `GRID_URL` | `http://localhost:4444` | Selenium Grid hub URL used by the pytest Appium fixture |
+| `GRID_URL` | `http://localhost:4444` | WebDriver router URL used by the pytest Appium fixture |
 | `GRIDFLEET_API_URL` | `http://localhost:8000/api` | GridFleet API base used for session reporting, config lookup, run helpers, and driver-pack catalog lookup |
 | `GRIDFLEET_TESTKIT_USERNAME` | unset | Machine-auth username sent as HTTP Basic auth on every API call. Required when the manager runs with `GRIDFLEET_AUTH_ENABLED=true`. Use the same value as the manager's `GRIDFLEET_MACHINE_AUTH_USERNAME`. |
 | `GRIDFLEET_TESTKIT_PASSWORD` | unset | Machine-auth password sent as HTTP Basic auth on every API call. Required when the manager runs with `GRIDFLEET_AUTH_ENABLED=true`. Use the same value as the manager's `GRIDFLEET_MACHINE_AUTH_PASSWORD`. |
 | `GRIDFLEET_TESTKIT_PACK_ID` | unset | Optional default driver pack id for Appium option building |
 | `GRIDFLEET_TESTKIT_PLATFORM_ID` | unset | Optional default platform id for Appium option building |
-| `GRIDFLEET_RUN_ID` | `free` | Optional run id injected into Appium capabilities as `gridfleet:run_id`. The pytest plugin sets this automatically when sessions are created inside a reserved run. |
+| `GRIDFLEET_RUN_ID` | unset | Optional run id. When set, drivers are created through the run-scoped grid endpoint `GRID_URL/run/{id}` so sessions land only on devices reserved for the run. Unset = free session on unreserved devices. Set this in the environment that launches pytest (e.g. the run launcher or CI step); the testkit reads it but does not set it. |
-The package assumes a running GridFleet API, a reachable Selenium Grid hub, and platform-specific Appium driver setup on the registered hosts. When auth is disabled on the manager, leave `GRIDFLEET_TESTKIT_USERNAME` / `GRIDFLEET_TESTKIT_PASSWORD` unset and the testkit will send no `Authorization` header.
+The package assumes a running GridFleet API, a reachable WebDriver router, and platform-specific Appium driver setup on the registered hosts. When auth is disabled on the manager, leave `GRIDFLEET_TESTKIT_USERNAME` / `GRIDFLEET_TESTKIT_PASSWORD` unset and the testkit will send no `Authorization` header.
 ## Pytest Plugin
@@ -149,7 +149,7 @@ If you need raw Appium control instead, omit `pack_id` and `platform_id`, then p
 - Creates an Appium session through `GRID_URL`
 - Injects `gridfleet:testName` with the pytest test name
-- Always injects `gridfleet:run_id`, taken from the `GRIDFLEET_RUN_ID` environment variable when set (for example, inside a reserved run), otherwise defaulting to `"free"`
+- Resolves the WebDriver endpoint from `GRIDFLEET_RUN_ID`: run-scoped URL inside a reserved run, bare grid URL otherwise. No GridFleet identity is injected into capabilities.
 - Reports final session status back to `GRIDFLEET_API_URL`
 - Exposes `device_config` for post-session config lookup using the runtime connection target
 - Exposes `device_test_data` for post-session operator-attached test data using the runtime connection target
@@ -218,7 +218,7 @@ finally:
 ### Targeting Devices by Tag
-GridFleet injects device tags into Grid node stereotypes as `appium:gridfleet:tag:<key>` capabilities, so Selenium Grid can route sessions to devices matching specific tags.
+GridFleet injects device tags into node stereotypes as `appium:gridfleet:tag:<key>` capabilities, so the router's backend allocation can route sessions to devices matching specific tags.
 ```python
 @pytest.mark.parametrize(
@@ -254,7 +254,7 @@ The `gridfleet_worker_id` fixture is informational only: it returns the pytest-x
 ### Reservation Flow
-GridFleet runs are grid-routed: once devices are reserved, the manager tags matching Grid nodes with the run id, and Selenium Grid routes new Appium sessions to those nodes automatically via the `gridfleet:run_id` capability. There are no per-worker claim or release calls.
+GridFleet runs are router-routed: once devices are reserved, the manager tags matching nodes with the run id, and the router routes new Appium sessions to those nodes automatically when they arrive through the run-scoped endpoint (`GRID_URL/run/{run_id}`). There are no per-worker claim or release calls.
 ```python
 from gridfleet_testkit import GridFleetClient, register_run_cleanup
@@ -418,7 +418,7 @@ Advanced example:
 The baseline examples share the same flow:
-1. Create a session through Selenium Grid
+1. Create a session through the WebDriver router
 2. Print the resolved connection context
 3. Save a screenshot
 4. Assert that the screenshot file exists and is non-empty

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/README.md RENAMED Viewed

@@ -36,7 +36,7 @@
 ## What It Does Not Own
 - Appium server installation or host-level driver setup
-- Selenium Grid lifecycle
+- WebDriver router lifecycle
 - Device registration, verification, or readiness setup
 - CI orchestration beyond the documented client helpers
@@ -75,15 +75,15 @@ The package supports Python 3.10 through 3.14.
 | Variable | Default | Meaning |
 | --- | --- | --- |
-| `GRID_URL` | `http://localhost:4444` | Selenium Grid hub URL used by the pytest Appium fixture |
+| `GRID_URL` | `http://localhost:4444` | WebDriver router URL used by the pytest Appium fixture |
 | `GRIDFLEET_API_URL` | `http://localhost:8000/api` | GridFleet API base used for session reporting, config lookup, run helpers, and driver-pack catalog lookup |
 | `GRIDFLEET_TESTKIT_USERNAME` | unset | Machine-auth username sent as HTTP Basic auth on every API call. Required when the manager runs with `GRIDFLEET_AUTH_ENABLED=true`. Use the same value as the manager's `GRIDFLEET_MACHINE_AUTH_USERNAME`. |
 | `GRIDFLEET_TESTKIT_PASSWORD` | unset | Machine-auth password sent as HTTP Basic auth on every API call. Required when the manager runs with `GRIDFLEET_AUTH_ENABLED=true`. Use the same value as the manager's `GRIDFLEET_MACHINE_AUTH_PASSWORD`. |
 | `GRIDFLEET_TESTKIT_PACK_ID` | unset | Optional default driver pack id for Appium option building |
 | `GRIDFLEET_TESTKIT_PLATFORM_ID` | unset | Optional default platform id for Appium option building |
-| `GRIDFLEET_RUN_ID` | `free` | Optional run id injected into Appium capabilities as `gridfleet:run_id`. The pytest plugin sets this automatically when sessions are created inside a reserved run. |
+| `GRIDFLEET_RUN_ID` | unset | Optional run id. When set, drivers are created through the run-scoped grid endpoint `GRID_URL/run/{id}` so sessions land only on devices reserved for the run. Unset = free session on unreserved devices. Set this in the environment that launches pytest (e.g. the run launcher or CI step); the testkit reads it but does not set it. |
-The package assumes a running GridFleet API, a reachable Selenium Grid hub, and platform-specific Appium driver setup on the registered hosts. When auth is disabled on the manager, leave `GRIDFLEET_TESTKIT_USERNAME` / `GRIDFLEET_TESTKIT_PASSWORD` unset and the testkit will send no `Authorization` header.
+The package assumes a running GridFleet API, a reachable WebDriver router, and platform-specific Appium driver setup on the registered hosts. When auth is disabled on the manager, leave `GRIDFLEET_TESTKIT_USERNAME` / `GRIDFLEET_TESTKIT_PASSWORD` unset and the testkit will send no `Authorization` header.
 ## Pytest Plugin
@@ -117,7 +117,7 @@ If you need raw Appium control instead, omit `pack_id` and `platform_id`, then p
 - Creates an Appium session through `GRID_URL`
 - Injects `gridfleet:testName` with the pytest test name
-- Always injects `gridfleet:run_id`, taken from the `GRIDFLEET_RUN_ID` environment variable when set (for example, inside a reserved run), otherwise defaulting to `"free"`
+- Resolves the WebDriver endpoint from `GRIDFLEET_RUN_ID`: run-scoped URL inside a reserved run, bare grid URL otherwise. No GridFleet identity is injected into capabilities.
 - Reports final session status back to `GRIDFLEET_API_URL`
 - Exposes `device_config` for post-session config lookup using the runtime connection target
 - Exposes `device_test_data` for post-session operator-attached test data using the runtime connection target
@@ -186,7 +186,7 @@ finally:
 ### Targeting Devices by Tag
-GridFleet injects device tags into Grid node stereotypes as `appium:gridfleet:tag:<key>` capabilities, so Selenium Grid can route sessions to devices matching specific tags.
+GridFleet injects device tags into node stereotypes as `appium:gridfleet:tag:<key>` capabilities, so the router's backend allocation can route sessions to devices matching specific tags.
 ```python
 @pytest.mark.parametrize(
@@ -222,7 +222,7 @@ The `gridfleet_worker_id` fixture is informational only: it returns the pytest-x
 ### Reservation Flow
-GridFleet runs are grid-routed: once devices are reserved, the manager tags matching Grid nodes with the run id, and Selenium Grid routes new Appium sessions to those nodes automatically via the `gridfleet:run_id` capability. There are no per-worker claim or release calls.
+GridFleet runs are router-routed: once devices are reserved, the manager tags matching nodes with the run id, and the router routes new Appium sessions to those nodes automatically when they arrive through the run-scoped endpoint (`GRID_URL/run/{run_id}`). There are no per-worker claim or release calls.
 ```python
 from gridfleet_testkit import GridFleetClient, register_run_cleanup
@@ -386,7 +386,7 @@ Advanced example:
 The baseline examples share the same flow:
-1. Create a session through Selenium Grid
+1. Create a session through the WebDriver router
 2. Print the resolved connection context
 3. Save a screenshot
 4. Assert that the screenshot file exists and is non-empty

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/examples/test_android_mobile_screenshot.py RENAMED Viewed

@@ -1,8 +1,8 @@
 """
-Manual baseline example: connect to an Android mobile device through Selenium Grid and take a screenshot.
+Manual baseline example: connect to an Android mobile device through the WebDriver router and take a screenshot.
 Requires:
-    - Selenium Grid hub running on localhost:4444
+    - WebDriver router running on localhost:4444
     - An Android mobile device registered and its Appium node running
     - The supported GridFleet testkit installed
     - Appium-Python-Client installed (`uv pip install -e ./testkit`)

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/examples/test_android_tv_screenshot.py RENAMED Viewed

@@ -1,8 +1,8 @@
 """
-Manual baseline example: connect to an Android TV device through Selenium Grid and take a screenshot.
+Manual baseline example: connect to an Android TV device through the WebDriver router and take a screenshot.
 Requires:
-    - Selenium Grid hub running on localhost:4444
+    - WebDriver router running on localhost:4444
     - An Android TV device registered and its Appium node running
     - The supported GridFleet testkit installed
     - Appium-Python-Client installed (`uv pip install -e ./testkit`)

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/examples/test_firetv_screenshot.py RENAMED Viewed

@@ -1,8 +1,8 @@
 """
-Manual baseline example: connect to a Fire TV device through Selenium Grid and take a screenshot.
+Manual baseline example: connect to a Fire TV device through the WebDriver router and take a screenshot.
 Requires:
-    - Selenium Grid hub running on localhost:4444
+    - WebDriver router running on localhost:4444
     - A Fire TV device registered and its Appium node running
     - The supported GridFleet testkit installed
     - Appium-Python-Client installed (`uv pip install -e ./testkit`)

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/examples/test_ios_simulator_screenshot.py RENAMED Viewed

@@ -1,8 +1,8 @@
 """
-Manual baseline example: connect to an iOS simulator through Selenium Grid and take a screenshot.
+Manual baseline example: connect to an iOS simulator through the WebDriver router and take a screenshot.
 Requires:
-    - Selenium Grid hub running on localhost:4444
+    - WebDriver router running on localhost:4444
     - An iOS simulator registered and its Appium node running
     - The supported GridFleet testkit installed
     - Appium with the XCUITest driver installed (`appium driver install xcuitest`)

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/examples/test_roku_screenshot.py RENAMED Viewed

@@ -1,8 +1,8 @@
 """
-Manual baseline example: connect to a Roku device through Selenium Grid and take a screenshot.
+Manual baseline example: connect to a Roku device through the WebDriver router and take a screenshot.
 Requires:
-    - Selenium Grid hub running on localhost:4444
+    - WebDriver router running on localhost:4444
     - A Roku device registered with Roku dev credentials in device config
     - Appium with the Roku driver installed (`appium driver install roku`)
     - The supported GridFleet testkit installed

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/examples/test_roku_sideload_screenshot.py RENAMED Viewed

@@ -2,7 +2,7 @@
 Manual advanced example: connect to a Roku device, sideload a sample app, and take a screenshot.
 Requires:
-    - Selenium Grid hub running on localhost:4444
+    - WebDriver router running on localhost:4444
     - A Roku device registered with Roku dev credentials in device config
     - Appium with the Roku driver installed (`appium driver install roku`)
     - The supported GridFleet testkit installed

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/examples/test_tvos_screenshot.py RENAMED Viewed

@@ -1,8 +1,8 @@
 """
-Manual baseline example: connect to a tvOS real device through Selenium Grid and take a screenshot.
+Manual baseline example: connect to a tvOS real device through the WebDriver router and take a screenshot.
 Requires:
-    - Selenium Grid hub running on localhost:4444
+    - WebDriver router running on localhost:4444
     - A tvOS real device registered and its Appium node running
     - The supported GridFleet testkit installed
     - Appium with the XCUITest driver installed (`appium driver install xcuitest`)

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/gridfleet_testkit/__init__.py RENAMED Viewed

@@ -6,7 +6,7 @@ the live Appium-side config can use `client.get_device_config(connection_target)
 Environment variables read by the client:
-- GRID_URL: Selenium Grid URL used by Appium helper defaults.
+- GRID_URL: WebDriver router URL used by Appium helper defaults.
 - GRIDFLEET_API_URL: GridFleet manager API base URL.
 - GRIDFLEET_TESTKIT_USERNAME: optional Basic auth username.
 - GRIDFLEET_TESTKIT_PASSWORD: optional Basic auth password.
@@ -41,13 +41,14 @@ from .client import (
     _default_api_url,
     _default_grid_url,
     register_run_cleanup,
+    run_grid_url,
 )
 from .sessions import build_error_session_payload, resolve_device_handle_from_driver
 try:
     __version__ = version("gridfleet-testkit")
 except PackageNotFoundError:
-    __version__ = "0.9.5"
+    __version__ = "0.10.0"
 __all__ = [
     "GRIDFLEET_API_URL",
@@ -72,6 +73,7 @@ __all__ = [
     "hydrate_allocated_device_from_driver",
     "register_run_cleanup",
     "resolve_device_handle_from_driver",
+    "run_grid_url",
 ]

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/gridfleet_testkit/appium.py RENAMED Viewed

@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, cast
 from appium import webdriver
 from appium.options.common import AppiumOptions
-from .client import GridFleetClient, _default_grid_url
+from .client import GridFleetClient, _default_grid_url, run_grid_url
 if TYPE_CHECKING:
     from collections.abc import Callable, Mapping
@@ -102,7 +102,6 @@ def build_appium_options(
 ) -> AppiumOptions:
     """Build Appium options from driver-pack catalog platform metadata."""
     params = dict(capabilities or {})
-    params.setdefault("gridfleet:run_id", os.environ.get("GRIDFLEET_RUN_ID", "free"))
     explicit_platform_name = params.get("platformName")
     if explicit_platform_name is not None and (pack_id is not None or platform_id is not None):
         raise ValueError("Use either pack_id/platform_id or the raw platformName capability, not both.")
@@ -126,6 +125,18 @@ def build_appium_options(
     return options
+def _resolve_grid_url(grid_url: str | None) -> str:
+    """Executor resolution: explicit URL wins; GRIDFLEET_RUN_ID (set externally
+    by the run launcher or CI before pytest starts) composes the run-scoped
+    endpoint; otherwise the bare grid URL — an explicit free session."""
+    if grid_url is not None:
+        return grid_url
+    run_id = os.environ.get("GRIDFLEET_RUN_ID")
+    if run_id:
+        return run_grid_url(run_id)
+    return _default_grid_url()
 def create_appium_driver(
     *,
     pack_id: str | None = None,
@@ -135,7 +146,7 @@ def create_appium_driver(
     grid_url: str | None = None,
     catalog_client: object | None = None,
 ) -> WebDriver:
-    """Create an Appium remote driver through Selenium Grid."""
+    """Create an Appium remote driver through the WebDriver router."""
     options = build_appium_options(
         pack_id=pack_id,
         platform_id=platform_id,
@@ -143,7 +154,7 @@ def create_appium_driver(
         test_name=test_name,
         catalog_client=catalog_client,
     )
-    return webdriver.Remote(grid_url or _default_grid_url(), options=options)
+    return webdriver.Remote(_resolve_grid_url(grid_url), options=options)
 def get_connection_target_from_driver(driver: WebDriver) -> str:

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/gridfleet_testkit/client.py RENAMED Viewed

@@ -31,6 +31,17 @@ def _default_grid_url() -> str:
     return os.getenv("GRID_URL", DEFAULT_GRID_URL)
+def run_grid_url(run_id: str, *, base: str | None = None) -> str:
+    """Run-scoped WebDriver endpoint for *run_id* (``{base}/run/{run_id}``).
+    Sessions created through it are admitted only to devices reserved for the
+    run; free sessions use the bare grid URL. Replaces the retired
+    ``gridfleet:run_id`` capability.
+    """
+    root = (base or _default_grid_url()).rstrip("/")
+    return f"{root}/run/{run_id}"
 def _default_api_url() -> str:
     return os.getenv("GRIDFLEET_API_URL", DEFAULT_GRIDFLEET_API_URL)

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/gridfleet_testkit/pytest_plugin.py RENAMED Viewed

@@ -9,6 +9,7 @@ import pytest
 from appium import webdriver
 from .appium import (
+    _resolve_grid_url,
     build_appium_options,
     get_device_config_for_driver,
     get_device_test_data_for_driver,
@@ -72,7 +73,7 @@ def appium_driver(
     gridfleet_client: GridFleetClient,
 ) -> Generator[WebDriver, None, None]:
     """
-    Create an Appium Remote driver through the Selenium Grid.
+    Create an Appium Remote driver through the WebDriver router.
     Parametrize with a dict of pack/catalog selection plus capabilities:
         @pytest.mark.parametrize(
@@ -84,7 +85,7 @@ def appium_driver(
     options = _build_driver_options(request, gridfleet_client)
     try:
-        driver = webdriver.Remote(_default_grid_url(), options=options)
+        driver = webdriver.Remote(_resolve_grid_url(None), options=options)
     except Exception as exc:
         # Driver creation failed before a Grid session was established (e.g.
         # SessionNotCreatedException). Register a device-less error session so the

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/pyproject.toml RENAMED Viewed

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 [project]
 name = "gridfleet-testkit"
-version = "0.9.5"
+version = "0.10.0"
 description = "Supported pytest and run-orchestration helpers for GridFleet integrations"
 readme = "README.md"
 license = "Apache-2.0"

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/tests/test_appium.py RENAMED Viewed

@@ -166,7 +166,6 @@ def test_create_appium_driver_uses_factory_options(monkeypatch: pytest.MonkeyPat
                 "platformName": "Android",
                 "appium:platform": "firetv_real",
                 "appium:automationName": "UiAutomator2",
-                "gridfleet:run_id": "free",
                 "gridfleet:testName": "manual-smoke",
             },
         )

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/tests/test_pytest_plugin.py RENAMED Viewed

@@ -286,7 +286,6 @@ def test_appium_driver_setup_failure_registers_device_less_error_session(monkeyp
         "appium:connection_type": "network",
         "appium:appPackage": "io.appium.android.apis",
         "platformName": "Android",
-        "gridfleet:run_id": "free",
         "gridfleet:testName": "test_broken",
         "appium:platform": "android_mobile",
     }

gridfleet_testkit-0.10.0/tests/test_run_scoped_url.py ADDED Viewed

@@ -0,0 +1,131 @@
+from __future__ import annotations
+import types
+from typing import TYPE_CHECKING
+import gridfleet_testkit.appium as appium_mod
+from gridfleet_testkit import pytest_plugin, run_grid_url
+from gridfleet_testkit.appium import _resolve_grid_url, build_appium_options
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+    import pytest
+RID = "0c8c057f-3ec1-4b9c-9d2e-9f3a86a2c001"
+def test_run_grid_url_composes_from_explicit_base() -> None:
+    assert run_grid_url(RID, base="http://router:4444/") == f"http://router:4444/run/{RID}"
+def test_run_grid_url_defaults_base_from_env(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setenv("GRID_URL", "http://lab-router:4444")
+    assert run_grid_url(RID) == f"http://lab-router:4444/run/{RID}"
+def test_resolve_grid_url_explicit_wins(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setenv("GRIDFLEET_RUN_ID", RID)
+    assert _resolve_grid_url("http://explicit:4444") == "http://explicit:4444"
+def test_resolve_grid_url_uses_run_env(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setenv("GRID_URL", "http://router:4444")
+    monkeypatch.setenv("GRIDFLEET_RUN_ID", RID)
+    assert _resolve_grid_url(None) == f"http://router:4444/run/{RID}"
+def test_resolve_grid_url_unset_env_is_free_session(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setenv("GRID_URL", "http://router:4444")
+    monkeypatch.delenv("GRIDFLEET_RUN_ID", raising=False)
+    assert _resolve_grid_url(None) == "http://router:4444"
+def test_no_run_id_capability_injected(monkeypatch: pytest.MonkeyPatch) -> None:
+    """The cap-era contract is dead: no gridfleet:run_id regardless of env."""
+    monkeypatch.setenv("GRIDFLEET_RUN_ID", RID)
+    options = build_appium_options(capabilities={"platformName": "Android"})
+    assert "gridfleet:run_id" not in dict(options.to_capabilities())
+# --- pytest plugin fixture URL routing ---
+class _FakeOptions:
+    def __init__(self) -> None:
+        self.platform_name: str | None = None
+        self.capabilities: dict[str, object] = {}
+    def set_capability(self, key: str, value: object) -> None:
+        self.capabilities[key] = value
+class _FakeDriver:
+    def __init__(self) -> None:
+        self.session_id = "sess-x"
+        self.capabilities: dict[str, object] = {}
+    def quit(self) -> None:
+        pass
+class _FakeClient:
+    def get_driver_pack_catalog(self) -> dict[str, object]:
+        return {"packs": []}
+    def register_session_from_driver(self, driver: object, **kwargs: object) -> dict[str, object]:
+        return {"ok": True}
+    def register_session(self, **kwargs: object) -> dict[str, object]:
+        return {"ok": True}
+    def update_session_status(self, session_id: str, status: str, *, suppress_errors: bool = True) -> dict[str, object]:
+        return {"ok": True}
+def _make_plugin_generator(monkeypatch: pytest.MonkeyPatch) -> tuple[list[tuple[str, object]], Iterator[object]]:
+    """Return (captured_calls, generator) after installing a minimal webdriver.Remote spy."""
+    captured: list[tuple[str, object]] = []
+    def fake_remote(url: str, *, options: object) -> _FakeDriver:
+        captured.append((url, options))
+        return _FakeDriver()
+    monkeypatch.setattr(appium_mod, "AppiumOptions", _FakeOptions)
+    # String target: `pytest_plugin.webdriver` is a transitive module attribute
+    # mypy strict (no_implicit_reexport) refuses to access statically.
+    monkeypatch.setattr("gridfleet_testkit.pytest_plugin.webdriver.Remote", fake_remote)
+    request = types.SimpleNamespace(
+        param={"platformName": "Android"},
+        node=types.SimpleNamespace(name="test_plugin_url"),
+    )
+    # pytest wraps fixtures in FixtureFunctionDefinition; __wrapped__ exists at
+    # runtime but not in pytest's stubs, so reach it via getattr.
+    fixture_fn = getattr(pytest_plugin.appium_driver, "__wrapped__")  # noqa: B009
+    gen: Iterator[object] = fixture_fn(request, _FakeClient())
+    return captured, gen
+def test_plugin_fixture_uses_run_scoped_url_when_run_id_set(monkeypatch: pytest.MonkeyPatch) -> None:
+    """When GRIDFLEET_RUN_ID is set, the plugin driver connects to GRID_URL/run/{id}."""
+    monkeypatch.setenv("GRID_URL", "http://router:4444")
+    monkeypatch.setenv("GRIDFLEET_RUN_ID", RID)
+    captured, gen = _make_plugin_generator(monkeypatch)
+    next(gen)
+    assert len(captured) == 1
+    assert captured[0][0] == f"http://router:4444/run/{RID}"
+def test_plugin_fixture_uses_bare_url_when_run_id_unset(monkeypatch: pytest.MonkeyPatch) -> None:
+    """When GRIDFLEET_RUN_ID is absent, the plugin driver connects to the bare GRID_URL."""
+    monkeypatch.setenv("GRID_URL", "http://router:4444")
+    monkeypatch.delenv("GRIDFLEET_RUN_ID", raising=False)
+    captured, gen = _make_plugin_generator(monkeypatch)
+    next(gen)
+    assert len(captured) == 1
+    assert captured[0][0] == "http://router:4444"

{gridfleet_testkit-0.9.5 → gridfleet_testkit-0.10.0}/uv.lock RENAMED Viewed

@@ -136,7 +136,7 @@ wheels = [
 [[package]]
 name = "gridfleet-testkit"
-version = "0.9.5"
+version = "0.10.0"
 source = { editable = "." }
 dependencies = [
     { name = "appium-python-client" },
@@ -454,27 +454,27 @@ wheels = [
 [[package]]
 name = "ruff"
-version = "0.15.15"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/84/6f/a76f7d96e5c962f5b69cee865e49c15c1116897c01990faa8a57edb62e7f/ruff-0.15.15.tar.gz", hash = "sha256:b8dff018130b46d8e5bf0f926ef6b60cf871d6d5ae45fc9334e09632daa741d6", size = 4706985, upload-time = "2026-05-28T14:16:57.784Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/fa/9d/3a45c05b8ab04b4705989de70a79008e27c8003296a0feaee9edc18dd7e9/ruff-0.15.15-py3-none-linux_armv6l.whl", hash = "sha256:cf93e5388f412e1b108b1f8b34a6e036b70fe8aff89393befad96fe48670311b", size = 10710652, upload-time = "2026-05-28T14:16:06.701Z" },
-    { url = "https://files.pythonhosted.org/packages/05/66/da974431624bf3b49f6ee1f9543c02d929ff1cba78b0d5a79c38cf21f744/ruff-0.15.15-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ac5a646d1f6a7dadd5d50842dae2c1f9862ac887ef5d1b1375e02def791fde6e", size = 11096615, upload-time = "2026-05-28T14:16:23.313Z" },
-    { url = "https://files.pythonhosted.org/packages/8c/09/7443452e5d290230a712103f2fdceeef7184f3ec99a2bd01c8be78aaceb5/ruff-0.15.15-py3-none-macosx_11_0_arm64.whl", hash = "sha256:77d955a431430c66f72dd94e379ad38a16daea3d25094872ac4edf9e797be530", size = 10436683, upload-time = "2026-05-28T14:16:40.974Z" },
-    { url = "https://files.pythonhosted.org/packages/53/01/d330c26a57fa4f3943a14424904027428315b700fe4d14a84bb123a649e5/ruff-0.15.15-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7614ee79c69788cf6cedd568069ade9cecc22a1ad20494efe8d0c9ebb4b622d4", size = 10769064, upload-time = "2026-05-28T14:16:28.905Z" },
-    { url = "https://files.pythonhosted.org/packages/1d/85/cc8770f8bdff541b1da8392d1634141fe4a0e3f4ee596605959b7906c27f/ruff-0.15.15-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:3cdb1679e06a1f6b47bc384714ae96f6e2fb65ca441eb78c43d2ca554176ce1f", size = 10511987, upload-time = "2026-05-28T14:16:43.732Z" },
-    { url = "https://files.pythonhosted.org/packages/7c/29/8c190c1472b63013583ba391f3342036e02010544c1270455ed8e519bdf3/ruff-0.15.15-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2728b93d7b23a603ea2c0ac6eb73d760bd38ec9de35f35fb41e18f7a3fee7622", size = 11275100, upload-time = "2026-05-28T14:16:55.244Z" },
-    { url = "https://files.pythonhosted.org/packages/9f/6b/7e145ce2cc8e63d6834eca03d83a0e18d121def5c69f91b4cf4011ed4879/ruff-0.15.15-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:be582fcc0db438902c7792b08d6ddf6c9b9e21addaa10092c2c741cfb09e5a45", size = 12176903, upload-time = "2026-05-28T14:16:14.368Z" },
-    { url = "https://files.pythonhosted.org/packages/80/a3/d5974637f68e451f7fadf015cf3101d1cd7d8ba5027cffe0b9e3826ebe6b/ruff-0.15.15-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7aa77465b8ecaf1a27bea098d696f7fed5e1eccbd10b321b682d6de586ae5627", size = 11404550, upload-time = "2026-05-28T14:16:20.138Z" },
-    { url = "https://files.pythonhosted.org/packages/fe/1c/e6e5e568f22be4fb05d6244234aba384c06b451252453b821e1a529263cf/ruff-0.15.15-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:48decfa11d740de4889de623be1463308346312f2409a56e24aa280c86162dc4", size = 11382027, upload-time = "2026-05-28T14:16:46.615Z" },
-    { url = "https://files.pythonhosted.org/packages/1d/01/170921b49fcd2e8858825593f91cf7146c3e40a5c3e6df763e4bb0484dde/ruff-0.15.15-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:a5015088452ca0081387063649ec67f06d3d1d6b8b936a1f836b5e9657ecd48c", size = 11366041, upload-time = "2026-05-28T14:16:26.247Z" },
-    { url = "https://files.pythonhosted.org/packages/87/54/a7bad711d7de93254e15e06a4c375b89a03d18de45d3e5dcc86a4472fb1a/ruff-0.15.15-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:f5294aab6356c81600fcdea3a62bb1b924dfd5e91767c12318d3f68f86af57cd", size = 10741795, upload-time = "2026-05-28T14:16:17.11Z" },
-    { url = "https://files.pythonhosted.org/packages/c9/31/38c075963668f8b41c6914ee0f6f318727fbe30ab9145cb29e6df464c5fa/ruff-0.15.15-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:db5bd4d802415cca656dc1616070b725952d6ae95eb5d4831e49fbd94a38f75f", size = 10511117, upload-time = "2026-05-28T14:16:31.767Z" },
-    { url = "https://files.pythonhosted.org/packages/9d/96/6ff689e1f7e375d1d97075eca022f74c2bab59554a432fe4d2e6f091986a/ruff-0.15.15-py3-none-musllinux_1_2_i686.whl", hash = "sha256:587a6278ed42059191c1a466e490bd7930fb50bd2e255398bc29616c895a61cb", size = 10994867, upload-time = "2026-05-28T14:16:35.149Z" },
-    { url = "https://files.pythonhosted.org/packages/c3/c2/5dce0ab9f92a8d534fa62b9bf9caca3eddb8c1a81b616f5e195ada4f0d6e/ruff-0.15.15-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:df0c1c084f5f4be9812f61518a45c440d3c30d69ce4bf6c5270e66d38338f02a", size = 11482101, upload-time = "2026-05-28T14:16:49.598Z" },
-    { url = "https://files.pythonhosted.org/packages/b1/c0/1003b60edd697c649faf61f1a34094b1abb38fb3d1181e3f895781250a08/ruff-0.15.15-py3-none-win32.whl", hash = "sha256:29428ea79694afbe756d45fd59b36f22b6b020dc0443cf7de0173046236964b9", size = 10716774, upload-time = "2026-05-28T14:16:52.337Z" },
-    { url = "https://files.pythonhosted.org/packages/02/a8/1269eddd6945a06c23f055ef7848886e37cf9d6a8bebb386a3115f01470c/ruff-0.15.15-py3-none-win_amd64.whl", hash = "sha256:8df0323902e15e24bc4bf246da830573d3cf3352bd0b9a164eab335d111ff4a4", size = 11868463, upload-time = "2026-05-28T14:16:11.333Z" },
-    { url = "https://files.pythonhosted.org/packages/4e/b2/920464c907b191e37469d477a1aa8bc048b8f36c4c1610dfa4ab87b39e18/ruff-0.15.15-py3-none-win_arm64.whl", hash = "sha256:3c8ceca6792f38196b8f589bc92eccd03eef286602da92e5dc05cc42ef6441b7", size = 11138498, upload-time = "2026-05-28T14:16:38.425Z" },
+version = "0.15.16"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/a6/bd/5f7ec371001337d8fa61701c186ff8b613ecac1651848c5950f4c4d5f2e9/ruff-0.15.16.tar.gz", hash = "sha256:d05e78d38c78caf020b03789e25106c93017db5a0cb6e2819885018c61343b78", size = 4714267, upload-time = "2026-06-04T16:33:09.974Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0c/42/53ef1c3953f157956db9bf7861e3bc50b9b887ce93300aa48cdba8336fe6/ruff-0.15.16-py3-none-linux_armv6l.whl", hash = "sha256:6ac3c0b3969cc6cf6b158c4e2f8f682acb58e7d700d8a44b65ecdc72d66ab0b2", size = 10709025, upload-time = "2026-06-04T16:32:51.935Z" },
+    { url = "https://files.pythonhosted.org/packages/93/9a/a79159346f19134a956607754e57d8d128f7a4c00f4ad2f7514d224c172c/ruff-0.15.16-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:197c207ed75ffba54a0dec23db4aa939a27a3053073e085e0042433cbdc58e4a", size = 11063550, upload-time = "2026-06-04T16:32:42.24Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/72/3ce2ac000a5299ec238e01f51397b3b653c93b077d9b1bfe8715bb895f20/ruff-0.15.16-py3-none-macosx_11_0_arm64.whl", hash = "sha256:3a39fec45ab316cc23e7558f23fea4a70403ddb5648ea9a4a3854a16973d0071", size = 10421345, upload-time = "2026-06-04T16:32:37.251Z" },
+    { url = "https://files.pythonhosted.org/packages/b0/c2/cc7fad3ec9169373f5b6a18f1917b91080feec40c3f9658334a1d28e2f03/ruff-0.15.16-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ba93191d79003116b95128c9d306e045200fdbd0bccb782b110f3cd1d4abc5cf", size = 10757217, upload-time = "2026-06-04T16:32:54.722Z" },
+    { url = "https://files.pythonhosted.org/packages/69/d2/3474009eaa0a65b31fa7152a2fad5e2f050c640ceb1e6b02ee6922e94c82/ruff-0.15.16-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c6ee4b90520630120ef032aa5cc10db483852dff950e78b1d717e2993a61ac8d", size = 10507035, upload-time = "2026-06-04T16:33:05.343Z" },
+    { url = "https://files.pythonhosted.org/packages/ca/81/b7ae6ccbd11f0c8dc3d5d67fc4be9b57ff57ca86ba56152021378e1277f2/ruff-0.15.16-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4e4215bc938bc3c8215c1472c1aa437e310fee20cd427335fec9d7e609563628", size = 11255291, upload-time = "2026-06-04T16:32:49.49Z" },
+    { url = "https://files.pythonhosted.org/packages/d9/e1/46e526f1a7cc90857ce6ddf25fbb77eb6568651ac38d71b033af07076dd5/ruff-0.15.16-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7c8d26be963b090f10e29abc8b3e74a2a321f6fa34e02424e30b5af89350ecbb", size = 12124922, upload-time = "2026-06-04T16:33:07.821Z" },
+    { url = "https://files.pythonhosted.org/packages/1a/da/5c791b088b596b24d0deb967fa28ae02ad751a140c0b9ea81c5ab915d6c0/ruff-0.15.16-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f198cf4123602a2280ed46c307bcbafe41758d6fee5b456b6b6058ca1514b3b4", size = 11332186, upload-time = "2026-06-04T16:33:02.971Z" },
+    { url = "https://files.pythonhosted.org/packages/72/11/5da87abe20047c8962361473923ebb2f62b595250126aadfad8c20649c1e/ruff-0.15.16-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bb27515fa6240fb586ae82b901a59e67d24acff86f2190b433dc542fe0435aeb", size = 11373541, upload-time = "2026-06-04T16:32:47.007Z" },
+    { url = "https://files.pythonhosted.org/packages/fe/2a/8554754c23a854ae3fd6b507e36ad61ddb121e298c6d5d617dec94ed0f14/ruff-0.15.16-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:a267c46ba1593fc26b8eecbea050b39d40c0b6bb7781ee11c90a02cd10032951", size = 11353014, upload-time = "2026-06-04T16:32:34.795Z" },
+    { url = "https://files.pythonhosted.org/packages/62/25/62ea41529ec89f742ea3fed9cb1059c72877ec7cf9b9e99ac9cf3294d1d9/ruff-0.15.16-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:528c68f39a91498a8d50e91ff5985df3d105782bab49cc378e73ac26bff083e8", size = 10737467, upload-time = "2026-06-04T16:32:26.348Z" },
+    { url = "https://files.pythonhosted.org/packages/90/17/334d3ad9de4d40f9dd58fdd09e35ce64553bb501e2f19a839e2fb6be14fc/ruff-0.15.16-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:7ed55c58950df60589a9a7a5d2f8fa5f54ebd287163be805adfe6ee95a9de123", size = 10521910, upload-time = "2026-06-04T16:32:32.54Z" },
+    { url = "https://files.pythonhosted.org/packages/4d/bd/3ac7c6ae77a885c1004b3dda2446ea401768d24f851c14b4ad4b24f6639c/ruff-0.15.16-py3-none-musllinux_1_2_i686.whl", hash = "sha256:d482feaf51512b50f9790ceb417a56a61dd1e9d9bf967662b9ed27c01b34f53a", size = 10979190, upload-time = "2026-06-04T16:32:57.492Z" },
+    { url = "https://files.pythonhosted.org/packages/33/d7/609546e6a413c3f216fbf2a50c928f97c80939154f6a0503114094a86191/ruff-0.15.16-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:1e15bc8c94513dae2a40cc9ef07c94fdd4ecc9e29dabebeebe170f952322c9e3", size = 11477014, upload-time = "2026-06-04T16:32:44.687Z" },
+    { url = "https://files.pythonhosted.org/packages/74/0d/f2cd247ad32633a5c36e97141a2c21b11c6279f7957bc2ff360b1e08fddd/ruff-0.15.16-py3-none-win32.whl", hash = "sha256:580378f7bd4aa25f72e74aa54948a9622f142b1e509521dd10902e886681cc1e", size = 10735541, upload-time = "2026-06-04T16:32:30.145Z" },
+    { url = "https://files.pythonhosted.org/packages/8b/9e/02e845ef151b1dee585e55c4739f8e1734ae1d9f1221dff65761c162208b/ruff-0.15.16-py3-none-win_amd64.whl", hash = "sha256:408256017284eddf98fff77b29aa4fb30f586042d535b2d9befc6512f400aaec", size = 11843403, upload-time = "2026-06-04T16:32:39.76Z" },
+    { url = "https://files.pythonhosted.org/packages/15/19/016553f86f207450aebebc2b2b5088d086b901cc8186c02ac4284db3bd88/ruff-0.15.16-py3-none-win_arm64.whl", hash = "sha256:8cd61783afb39638a7133ef0d2dfb1e91277593962f81b5a8423eb0b888a6121", size = 11134555, upload-time = "2026-06-04T16:33:00.136Z" },
 ]
 [[package]]

gridfleet_testkit-0.9.5/tests/test_pytest_plugin_grid_run_id_injection.py DELETED Viewed

@@ -1,29 +0,0 @@
-from __future__ import annotations
-from typing import TYPE_CHECKING
-from gridfleet_testkit.appium import build_appium_options
-if TYPE_CHECKING:
-    import pytest
-    from appium.options.common import AppiumOptions
-def _caps(options: AppiumOptions) -> dict[str, object]:
-    return dict(options.to_capabilities())
-def test_injects_free_when_no_run_id_env(monkeypatch: pytest.MonkeyPatch) -> None:
-    monkeypatch.delenv("GRIDFLEET_RUN_ID", raising=False)
-    options = build_appium_options(capabilities={"platformName": "Android"})
-    assert _caps(options)["gridfleet:run_id"] == "free"
-def test_injects_run_id_env(monkeypatch: pytest.MonkeyPatch) -> None:
-    monkeypatch.setenv("GRIDFLEET_RUN_ID", "run-123")
-    options = build_appium_options(capabilities={"platformName": "Android"})
-    assert _caps(options)["gridfleet:run_id"] == "run-123"