Use cmd-mox to stub rust build command tests#92
Use cmd-mox to stub rust build command tests#92leynos merged 4 commits intopython-lib-release-actionfrom
Conversation
Reviewer's GuideThis PR replaces ad-hoc subprocess patches in the Rust build tests with cmd-mox stubs and spies by adding cmd-mox as a dev dependency, configuring its pytest plugin, introducing reusable stub helpers, and updating tests to use cmd-mox’s replay/verify API while skipping unsupported platforms on Windows. File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the Note Other AI code review bot(s) detectedCodeRabbit has detected other AI code review bot(s) in this pull request and will avoid duplicating their findings in the review comments. This may lead to a less comprehensive review. ✨ Finishing touches🧪 Generate unit tests
Comment |
There was a problem hiding this comment.
Hey there - I've reviewed your changes - here's some feedback:
- Extract the shared cmd-mox helpers (_register_cross_version_stub, _register_rustup_toolchain_stub, _register_docker_info_stub) and the CMD_MOX_UNSUPPORTED marker into your global conftest to avoid duplicating them in every test file.
- Consider providing a fixture or pytest hook that automatically calls cmd_mox.replay() at test setup and cmd_mox.verify() at teardown to remove the repetitive boilerplate from each test.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- Extract the shared cmd-mox helpers (_register_cross_version_stub, _register_rustup_toolchain_stub, _register_docker_info_stub) and the CMD_MOX_UNSUPPORTED marker into your global conftest to avoid duplicating them in every test file.
- Consider providing a fixture or pytest hook that automatically calls cmd_mox.replay() at test setup and cmd_mox.verify() at teardown to remove the repetitive boilerplate from each test.
## Individual Comments
### Comment 1
<location> `pyproject.toml:33` </location>
<code_context>
"pyyaml>=6.0,<7.0",
"ty>=0.0.1a20",
"uuid6>=2025.0.1",
+ "cmd-mox@git+https://github.com/leynos/cmd-mox.git",
]
</code_context>
<issue_to_address>
**suggestion:** Consider pinning the cmd-mox dependency to a specific commit or tag.
Pinning ensures build reproducibility and consistency across environments.
Suggested implementation:
```
"cmd-mox@git+https://github.com/leynos/cmd-mox.git@d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3",
```
Replace `d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3` with the actual commit hash or tag you want to pin to. You can find the latest commit hash or a stable tag on the https://github.com/leynos/cmd-mox repository.
</issue_to_address>
### Comment 2
<location> `.github/actions/rust-build-release/tests/test_cross_install.py:401-403` </location>
<code_context>
@CMD_MOX_UNSUPPORTED
def test_installs_cross_without_container_runtime(
main_module: ModuleType,
cross_module: ModuleType,
module_harness: HarnessFactory,
cmd_mox,
) -> None:
"""Installs cross even when no container runtime is available."""
cross_env = module_harness(cross_module)
app_env = module_harness(main_module)
default_toolchain = main_module.DEFAULT_TOOLCHAIN
rustup_stdout = f"{default_toolchain}-x86_64-unknown-linux-gnu\n"
cross_path = _register_cross_version_stub(cmd_mox)
rustup_path = _register_rustup_toolchain_stub(cmd_mox, rustup_stdout)
cross_checks = [None, cross_path]
def fake_which(name: str) -> str | None:
if name == "cross":
return cross_checks.pop(0) if cross_checks else cross_path
if name in {"docker", "podman"}:
return None
if name == "rustup":
return rustup_path
return None
cross_env.patch_shutil_which(fake_which)
app_env.patch_shutil_which(fake_which)
cmd_mox.replay()
main_module.main("x86_64-unknown-linux-gnu", default_toolchain)
cmd_mox.verify()
install = next(
cmd for cmd in cross_env.calls if cmd[:3] == ["cargo", "install", "cross"]
)
assert "--locked" in install
idx = install.index("--version")
assert install[idx + 1] == "0.2.5"
build_cmd = app_env.calls[-1]
assert build_cmd[0] == "cargo"
assert build_cmd[1] == f"+{default_toolchain}-x86_64-unknown-linux-gnu"
</code_context>
<issue_to_address>
**suggestion (code-quality):** We've found these issues:
- Lift code into else after jump in control flow ([`reintroduce-else`](https://docs.sourcery.ai/Reference/Default-Rules/refactorings/reintroduce-else/))
- Replace if statement with if expression ([`assign-if-exp`](https://docs.sourcery.ai/Reference/Default-Rules/refactorings/assign-if-exp/))
```suggestion
return rustup_path if name == "rustup" else None
```
</issue_to_address>
### Comment 3
<location> `.github/actions/rust-build-release/tests/test_cross_install.py:481-483` </location>
<code_context>
@CMD_MOX_UNSUPPORTED
def test_falls_back_to_cargo_when_runtime_unusable(
main_module: ModuleType,
cross_module: ModuleType,
module_harness: HarnessFactory,
cmd_mox,
) -> None:
"""Falls back to cargo when docker exists but is unusable."""
cross_env = module_harness(cross_module)
app_env = module_harness(main_module)
default_toolchain = main_module.DEFAULT_TOOLCHAIN
rustup_stdout = f"{default_toolchain}-x86_64-unknown-linux-gnu\n"
cross_path = _register_cross_version_stub(cmd_mox)
rustup_path = _register_rustup_toolchain_stub(cmd_mox, rustup_stdout)
docker_path = _register_docker_info_stub(cmd_mox, exit_code=1)
def fake_which(name: str) -> str | None:
if name == "docker":
return docker_path
if name == "cross":
return cross_path
if name == "rustup":
return rustup_path
return None
cross_env.patch_shutil_which(fake_which)
app_env.patch_shutil_which(fake_which)
cmd_mox.replay()
main_module.main("x86_64-unknown-linux-gnu", default_toolchain)
cmd_mox.verify()
assert any(cmd[0] == "cargo" for cmd in app_env.calls)
assert all(cmd[0] != "cross" for cmd in app_env.calls)
</code_context>
<issue_to_address>
**suggestion (code-quality):** We've found these issues:
- Lift code into else after jump in control flow ([`reintroduce-else`](https://docs.sourcery.ai/Reference/Default-Rules/refactorings/reintroduce-else/))
- Replace if statement with if expression ([`assign-if-exp`](https://docs.sourcery.ai/Reference/Default-Rules/refactorings/assign-if-exp/))
```suggestion
return rustup_path if name == "rustup" else None
```
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
|
@coderabbitai please create a new GitHub issue for the following test failure / runtime error: |
|
Tip For best results, initiate chat on the files or code changes. 🧩 Analysis chain@leynos I'll create a GitHub issue for the Windows test failure related to Docker timeouts. 🏁 Script executed: Length of output: 50 Perfect! I've successfully created GitHub issue #93 for the Windows Docker timeout test failures. The issue has been created with:
The issue is now available at: #93 This will help track the Windows-specific Docker timeout problem separately from the cmd-mox integration work in this PR. |
* Use cmd-mox for rust build command tests * Guard cmd-mox integration on Windows * Refactor cmd-mox helpers into shared conftest * Apply cmd-mox fake which simplification
* Use cmd-mox for rust build command tests * Guard cmd-mox integration on Windows * Refactor cmd-mox helpers into shared conftest * Apply cmd-mox fake which simplification
* Use cmd-mox for rust build command tests * Guard cmd-mox integration on Windows * Refactor cmd-mox helpers into shared conftest * Apply cmd-mox fake which simplification
* Use cmd-mox for rust build command tests * Guard cmd-mox integration on Windows * Refactor cmd-mox helpers into shared conftest * Apply cmd-mox fake which simplification
* Use cmd-mox for rust build command tests * Guard cmd-mox integration on Windows * Refactor cmd-mox helpers into shared conftest * Apply cmd-mox fake which simplification
* Add release-to-pypi-uv composite action * Document trusted publishing permissions * Clarify GH_TOKEN handling in README * Fix local usage example * Improve GitHub release error handling * Fix cmd_utils discovery in publish script * Skip more build caches * Fail fast on TOML parse errors * Format release summary output * Add no-tag error test * Test TOML parse failures * Make uv python version configurable * Document concurrency guard in usage * Address review feedback with retries and tests * Improve TOML version validation and test strategy Extends boolean parsing to support more truthy values when validating dynamic version flags in TOML files. Refactors tests to run in-process with better coverage of various flag values and scenarios, replacing subprocess-based tests for efficiency and detail. Updates action to simplify Python version handling with uv and improves path detection for testing. These changes make validation logic more robust and enhance test reliability. * Add cmd-mox users guide * Use cmd-mox to stub rust build command tests (#92) * Use cmd-mox for rust build command tests * Guard cmd-mox integration on Windows * Refactor cmd-mox helpers into shared conftest * Apply cmd-mox fake which simplification * Mark Windows smoke tests as xfail (#94) * Mark Windows smoke tests as xfail * Tighten Windows smoke test expectations * Address reviewer feedback for release-to-pypi-uv action (#98) * Address review comments for release to PyPI action * Add tests and docs for python-version handling * Fix cmd_mox fixture usage and expose dev extra (#101) * Fix cmd_mox fixture usage and expose dev extras * Remove pyproject optional dev extra * Remove Pyright configuration * Add missing docstrings to release-to-pypi-uv modules (#103) * Silence type-check import lints for release action (#104) * Add toolchain-specific cargo cache key and clean shellstub imports (#88) * Address review feedback for shellstub imports * Fix MSYS2 install comments breaking pacman (#89) * Fix MSYS2 install comments breaking pacman * Fix Windows llvm-mingw metadata export * Handle runtime detection timeouts * Fix rust host detection timeout and Windows bin path (#91) * Fix rust host detection timeout and Windows bin path * Add timeout coverage for rust host detection * Unify runtime probe timeout configuration * test: capture rustc probe kwargs in timeout test * Remove inline comments from Windows GNU MSYS2 package list (#99) * Remove inline MSYS2 install comments * Skip nfpm steps on Windows builds * Handle nfpm packaging only for Linux * Fix Windows invocation of rust-build-release (#102) * Silence type-check import lints for release action * Adds ignore rule for Crush agent artifacts Ignores files generated by the Crush AI agent to prevent them from being tracked in version control. Adds a symlink to AGENTS.md for discovery by Crush * Format code after rebase validation to satisfy repo style checks. 💘 Generated with Crush Co-Authored-By: Crush <crush@charm.land> * fmt: extend fmt target to run ruff check --select D202,I001 --fix; apply resulting fixes 💘 Generated with Crush Co-Authored-By: Crush <crush@charm.land> --------- Co-authored-by: Payton McIntosh <pmcintosh@df12.net> Co-authored-by: Crush <crush@charm.land> * Narrow module fixtures to ModuleType (#105) * Add docstrings for release-to-pypi-uv tests and helpers (#106) * Add missing docstrings for release-to-pypi-uv tests * Simplify cmd-mox typing and streamline docstrings * Apply formatting * chore: remove unused imports across scripts and tests * style(_helpers): alphabetise __all__ tuple * tests: drop superfluous parentheses from @pytest.fixture usage --------- Co-authored-by: Payton McIntosh <pmcintosh@df12.net> * Scope type-checking imports (#111) * Scope type-checking imports * Fix lint warnings across release scripts * Clarify cargo stream capture error * ci: add lint and format checks * Install action-validator in CI lint workflow * Install bun validator packages in CI * Test full success message for matching versions (#113) * Address review comments (#116) * Address review feedback for release-to-pypi-uv actions (#112) * Address review feedback * Add CLI coverage for publish and validate scripts * Add deterministic validation tests and bunx validator checks * Update ci.yml remove unneeded step * Fix formatting * Fix Windows xfail marker removal for pytest 8 (#120) * Fix Windows xfail marker removal for pytest 8 * Tighten Windows xfail marker filtering * Handle runtime probe timeouts and expand release tests (#119) * Handle runtime probe timeouts and expand release tests * Add _probe_runtime coverage and assert timeout warnings * Expand TOML skip directories for release validation (#122) * Expand pyproject skip list handling * Strengthen TOML and runtime timeout tests * Assert cargo fallback logs podman failure * Parameterize skip-directory regression * Reinforce regression coverage for release tooling (#130) * Refine skip directory regression parameterization * Document skip directories and DRY timeout assertions * Parametrize publish index test * Refactor runtime timeout tests * Rebase onto origin/python-lib-release-action and resolve conflicts - Resolve merge in validate_toml_versions tests by standardizing module loading - Register dynamically loaded scripts in sys.modules to support reload semantics - Make toolchain triple test robust to host arch by selecting matching target - Run formatting, lint, typecheck, and tests to validate integration 💘 Generated with Crush Co-Authored-By: Crush <crush@charm.land> --------- Co-authored-by: Crush <crush@charm.land> * Harden release-to-pypi-uv workflow and regression coverage (#134) * Improve release validation jitter handling * Adjust runtime fallback host triples per platform * Make release validation deterministic and configurable * Rebase python-lib-release-action onto origin/main; resolve conflicts preserving branch intent; drop uv.lock in favor of main; fix tests and typing/lint issues; all tests pass and linters clean * Close cargo pipes when coverage stream missing (#137) * Close cargo pipes when missing * Ensure cargo pipes close on all paths * Ensure guard closes cargo pipes before exiting * Handle release script auth failure and multiline outputs (#136) * Handle release script auth failure and multiline outputs * Harden windows toolchain setup and extend runtime tests * Handle release auth errors and tweak toolchain retries * Fix cross install warning expectation (#139) * Fix cross install warning assertion * Harden cross install harness checks * Sanitize runtime probe timeout and guard actions * Refine runtime probe helpers and add timeout tests * Fix runtime probe lint findings * Share echo recorder fixture across runtime tests * Update fmt target description (#140) * Resolve rebase conflicts and align runtime tests with platform/timeouts from main while preserving branch improvements; ensure formatting passes and all tests/linters are green. 💘 Generated with Crush Co-Authored-By: Crush <crush@charm.land> --------- Co-authored-by: Payton McIntosh <pmcintosh@df12.net> Co-authored-by: Crush <crush@charm.land>
Summary
Testing
https://chatgpt.com/codex/tasks/task_e_68cddf10aa54832297cc3f589642beeb
Summary by Sourcery
Adopt cmd-mox plugin to stub and spy on external CLI invocations in rust build release tests, replacing manual subprocess patches and simplifying test setup.
Enhancements:
Build:
CI:
Tests: