pdurlej/platform

Fork 0

fix(tests): register docker mock fixture directly #840

Merged

pdurlej merged 1 commit from codex/808-pytest-docker-mock into main

2026-06-26 14:36:05 +02:00

codex commented

2026-06-26 14:07:27 +02:00

Collaborator

Canary status: missing — fire canary 3+3 manually before merge

Canary Context Pack

Product story

Platformctl tests need to keep collecting under pytest 9 so agents can trust the local verification surface instead of debugging fixture discovery drift.

What changed

Replaced nested pytest_plugins fixture registration with an explicit docker_mock fixture import/re-export in control-plane/platformctl/tests/conftest.py.

Why it changed

Issue #808 identified that nested pytest_plugins is the brittle part for pytest 9 compatibility, while ruff may remove a plain import unless it is intentionally exported.

Files touched

control-plane/platformctl/tests/conftest.py

Relevant context

control-plane/platformctl/tests/fixtures/docker_mock.py
control-plane/platformctl/tests/test_plan_integration.py

Runtime evidence

None. Test-only change; no runtime mutation.

Known constraints

This is intentionally limited to fixture registration. No platformctl planning semantics changed.

Explicit out-of-scope

Broad ruff cleanup.
Runtime Docker behavior.
Module manifest changes.

Requested decision

Approve merge if CI matches local verification.

Merge blockers

docker_mock fixture not discoverable by test_plan_integration.py.
Ruff flags the intentional import.

Spec sources read

control-plane/platformctl/tests/conftest.py
control-plane/platformctl/tests/fixtures/docker_mock.py
control-plane/platformctl/tests/test_plan_integration.py

Verification

PYTHONPATH=control-plane python3 -m pytest control-plane/platformctl/tests/test_plan_integration.py — passed on system Python 3.14 / pytest 9.0.3.
ruff check control-plane/platformctl/tests/conftest.py — passed.
PYTHONPATH=control-plane /private/tmp/platform-808-venv/bin/python -m pytest control-plane/platformctl/tests/test_plan_integration.py — passed on Python 3.12.12 / pytest 9.1.1.
PYTHONPATH=control-plane /private/tmp/platform-808-venv/bin/python -m pytest control-plane/platformctl/tests — 827 passed on Python 3.12.12 / pytest 9.1.1.

Closes #808

Canary status: missing — fire canary 3+3 manually before merge ## Canary Context Pack ### Product story Platformctl tests need to keep collecting under pytest 9 so agents can trust the local verification surface instead of debugging fixture discovery drift. ### What changed Replaced nested `pytest_plugins` fixture registration with an explicit `docker_mock` fixture import/re-export in `control-plane/platformctl/tests/conftest.py`. ### Why it changed Issue #808 identified that nested `pytest_plugins` is the brittle part for pytest 9 compatibility, while ruff may remove a plain import unless it is intentionally exported. ### Files touched - `control-plane/platformctl/tests/conftest.py` ### Relevant context - `control-plane/platformctl/tests/fixtures/docker_mock.py` - `control-plane/platformctl/tests/test_plan_integration.py` ### Runtime evidence None. Test-only change; no runtime mutation. ### Known constraints This is intentionally limited to fixture registration. No platformctl planning semantics changed. ### Explicit out-of-scope - Broad ruff cleanup. - Runtime Docker behavior. - Module manifest changes. ### Requested decision Approve merge if CI matches local verification. ### Merge blockers - `docker_mock` fixture not discoverable by `test_plan_integration.py`. - Ruff flags the intentional import. ## Spec sources read - `control-plane/platformctl/tests/conftest.py` - `control-plane/platformctl/tests/fixtures/docker_mock.py` - `control-plane/platformctl/tests/test_plan_integration.py` ## Verification - `PYTHONPATH=control-plane python3 -m pytest control-plane/platformctl/tests/test_plan_integration.py` — passed on system Python 3.14 / pytest 9.0.3. - `ruff check control-plane/platformctl/tests/conftest.py` — passed. - `PYTHONPATH=control-plane /private/tmp/platform-808-venv/bin/python -m pytest control-plane/platformctl/tests/test_plan_integration.py` — passed on Python 3.12.12 / pytest 9.1.1. - `PYTHONPATH=control-plane /private/tmp/platform-808-venv/bin/python -m pytest control-plane/platformctl/tests` — 827 passed on Python 3.12.12 / pytest 9.1.1. Closes #808

codex added 1 commit

2026-06-26 14:07:27 +02:00

fix(tests): register docker mock fixture directly

python-ci / Python 3.11 (pull_request) Successful in 41s

Details

python-ci / Python 3.13 (pull_request) Successful in 42s

Details

base-is-main / guard (pull_request) Successful in 1s

Details

canary-required / collect-diff (pull_request) Successful in 4s

Details

patchwarden-client-dry-run / collect-diff (pull_request) Successful in 4s

Details

patchwarden-pr-sanity / collect-diff (pull_request) Successful in 5s

Details

platformctl plan / auto-apply scope (pull_request) Successful in 17s

Details

pyfallow / Pyfallow gate (control-plane) (pull_request) Successful in 16s

Details

python-ci / Python 3.12 (pull_request) Successful in 43s

Details

canary-required / canary (pull_request) Successful in 16s

Details

patchwarden-client-dry-run / dry-run (pull_request) Successful in 17s

Details

patchwarden-pr-sanity / sanity (pull_request) Successful in 49s

Details

41c6a7a5b8

patchwarden commented

2026-06-26 14:11:45 +02:00

First-time contributor

Patchwarden PR sanity

Operator signal: 🛑 STOP - reviewer finding(s) must be addressed or explicitly accepted.

Automerge signal: ❌ NOT READY - no unattended merge or APPROVED review should be published.

Verdict: 🛑 STOP - a model reviewer reported actionable findings.

Next step: Address the reviewer finding(s), or leave a human decision explaining why the risk is accepted.

PR: 840
Commit: 41c6a7a5b89baad2fd57757ac8e955fa34f20b1b
Status: advisory_findings
Reviewer health: findings
Security-sensitive label: missing
Authority: Patchwarden policy signal; branch protection and automerge controller remain merge authority.
Model mix: glm-5.2:cloud, deepseek-v4-pro:cloud, kimi-k2.7-code:cloud

What I checked

Changed files: 1
Deterministic blocker scan: clean
Model reviewer lanes: 3
Comment contract: this comment is updated in place via a hidden Patchwarden marker.

Approval Handoff

State: not_ready_reviewer_findings
Action: address reviewer finding(s) or leave a human decision before any unattended approval.
Boundary: branch protection and the automerge controller remain merge authority.

Signal Board

Legend: ✅ evidence is sufficient; 🟡 controller still has work; ⚠️ automation retries first; 🛑/❌ do not approve or merge.

Lane	Signal	Meaning
🧪 Deterministic sanity	✅ `clean`	No deterministic blockers found.
🧠 Model reviewers	❌ `findings`	Address reviewer finding(s) before approval.
🛡️ Patchwarden approval	❌ `not_ready_reviewer_findings`	No unattended APPROVED review should be published.
🚦 Unattended automerge	❌ `ineligible`	Outside the narrow safe-docs/status unattended lane.
🙋 Owner attention	🔁 `automation first`	Retry, repair, or inspect automation before asking the owner.

Scope blocker: non-doc/status path(s): control-plane/platformctl/tests/conftest.py
🧭 Merge authority: branch protection and automerge controller remain authoritative.

Required Fixes

No deterministic blockers.

Reviewer Details

Model reviewer lanes

`global-glm` / `glm-5.2:cloud`

Status: ok
Verdict: OK
Findings: none

`global-deepseek` / `deepseek-v4-pro:cloud`

Status: ok
Verdict: OK
Findings: none

`redteam` / `kimi-k2.7-code:cloud`

Status: ok
Verdict: NOT_OK
medium pytest_plugins removal silently drops other fixtures/hooks in docker_mock module
- Evidence: control-plane/platformctl/tests/conftest.py diff replaces pytest_plugins = ["platformctl.tests.fixtures.docker_mock"]withfrom platformctl.tests.fixtures.docker_mock import docker_mock as docker_mockandall = ["docker_mock"]. On
- Next: Inspect control-plane/platformctl/tests/fixtures/docker_mock.py for additional fixtures or hooks; if any exist, import and re-export them explicitly in conftest.py or retain pytest_plugins for that module.

Policy notes

Patchwarden PR sanity is the first merge-lane signal for this PR.
Models produce findings; Patchwarden/policy produces decisions.
Model findings alone do not fail the status check; they require human or agent disposition.
Formal approval is separate from this comment and requires clean reviewer health.
Automerge remains delegated to branch protection and the automerge pilot.

# Patchwarden PR sanity **Operator signal:** 🛑 STOP - reviewer finding(s) must be addressed or explicitly accepted. **Automerge signal:** ❌ NOT READY - no unattended merge or APPROVED review should be published. **Verdict:** 🛑 STOP - a model reviewer reported actionable findings. **Next step:** Address the reviewer finding(s), or leave a human decision explaining why the risk is accepted. - PR: `840` - Commit: `41c6a7a5b89baad2fd57757ac8e955fa34f20b1b` - Status: `advisory_findings` - Reviewer health: `findings` - Security-sensitive label: `missing` - Authority: Patchwarden policy signal; branch protection and automerge controller remain merge authority. - Model mix: `glm-5.2:cloud`, `deepseek-v4-pro:cloud`, `kimi-k2.7-code:cloud` ## What I checked - Changed files: `1` - Deterministic blocker scan: `clean` - Model reviewer lanes: `3` - Comment contract: this comment is updated in place via a hidden Patchwarden marker. ## Approval Handoff - State: `not_ready_reviewer_findings` - Action: address reviewer finding(s) or leave a human decision before any unattended approval. - Boundary: branch protection and the automerge controller remain merge authority. ## Signal Board - Legend: ✅ evidence is sufficient; 🟡 controller still has work; ⚠️ automation retries first; 🛑/❌ do not approve or merge. | Lane | Signal | Meaning | | --- | --- | --- | | 🧪 Deterministic sanity | ✅ `clean` | No deterministic blockers found. | | 🧠 Model reviewers | ❌ `findings` | Address reviewer finding(s) before approval. | | 🛡️ Patchwarden approval | ❌ `not_ready_reviewer_findings` | No unattended APPROVED review should be published. | | 🚦 Unattended automerge | ❌ `ineligible` | Outside the narrow safe-docs/status unattended lane. | | 🙋 Owner attention | 🔁 `automation first` | Retry, repair, or inspect automation before asking the owner. | - Scope blocker: non-doc/status path(s): `control-plane/platformctl/tests/conftest.py` 🧭 Merge authority: branch protection and automerge controller remain authoritative. ## Required Fixes No deterministic blockers. ## Reviewer Details <details> <summary>Model reviewer lanes</summary> ### `global-glm` / `glm-5.2:cloud` - Status: `ok` - Verdict: `OK` - Findings: none ### `global-deepseek` / `deepseek-v4-pro:cloud` - Status: `ok` - Verdict: `OK` - Findings: none ### `redteam` / `kimi-k2.7-code:cloud` - Status: `ok` - Verdict: `NOT_OK` - **`medium`** pytest_plugins removal silently drops other fixtures/hooks in docker_mock module - Evidence: `control-plane/platformctl/tests/conftest.py diff replaces `pytest_plugins = ["platformctl.tests.fixtures.docker_mock"]` with `from platformctl.tests.fixtures.docker_mock import docker_mock as docker_mock` and `__all__ = ["docker_mock"]`. On` - Next: Inspect `control-plane/platformctl/tests/fixtures/docker_mock.py` for additional fixtures or hooks; if any exist, import and re-export them explicitly in `conftest.py` or retain `pytest_plugins` for that module. </details> ## Policy notes - Patchwarden PR sanity is the first merge-lane signal for this PR. - Models produce findings; Patchwarden/policy produces decisions. - Model findings alone do not fail the status check; they require human or agent disposition. - Formal approval is separate from this comment and requires clean reviewer health. - Automerge remains delegated to branch protection and the automerge pilot.