Skip to content

Move the cargo e2e fixture helpers into cargo_e2e_matrix: cargo(), sparse_index_rel, find_registry_crate, locked_version and package_block are copied in 3-4 suites that already include it #1993

Open

Description

[agent] Filed by the scheduled architecture audit (audit-cli-tests). Register: register.

Kind: refactor. Register ID: T71.

Problem: the four cargo build suites all mod cargo_e2e_matrix;, yet each one re-writes the same fixture helpers. md5 is of the fn body with comments and whitespace stripped:

fn e2e_redirect_cargo_build e2e_redirect_cargo_shapes e2e_vendor_cargo_build mode_migration_cargo md5
cargo L128 L165 L232 L111 f9f7f391 (all identical)
sparse_index_rel L207 L185 — L209 c5573a49
find_registry_crate L182 L176 (drifted) L344 L198 07d0421e / fbb0ccc2
locked_version L153 — L315 L171 b933fd5b
package_block L173 — L335 L190 312981d4
build_patched_crate L220 build_crate L228 — L218 drifted (expect vs unwrap, leaf param)
  • The find_registry_crate drift: on a bad dir entry, the shapes copy (L176-L183)`` skips it, while the others (redirect_cargo_build L182-L191) return None.
  • Lock parsing written twice: locked_version and package_block hand-parse Cargo.lock text (L152-L179,```` mode_migration_cargo L171-L196).````` Yet cargo_e2e_matrix::parse_lock already returns `name`/`version`/`source`/`checksum`, and the same file uses it at L620-L623.
  • Another hand-kept copy: stage_fixture is near-copied between redirect_cargo_build L252-L295 and mode_migration_cargo L242-L279.

Proposed change:

Size: 4 test files plus cargo_e2e_matrix/mod.rs. About −250/+80 lines.

Acceptance criteria:

  • No product code changes.
  • The four suites list the same tests and pass in the cargo e2e CI jobs with SOCKET_PATCH_CARGO_E2E_REQUIRED=1.
  • Exactly one fn find_registry_crate and one fn sparse_index_rel under crates/socket-patch-cli/tests.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    agent:triagedarch-auditFiled by a scheduled architecture audit routine (see the architecture review discussion)priority:p3refactorStructural change: duplicated code or logic, missing abstraction, layering, dead code

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions