refactor(ci): consolidate the CI-env scrubber into a shared testing module#1442
Conversation
This was referenced May 19, 2026
Member
Author
|
This pull request is part of a Mergify stack:
|
This was referenced May 19, 2026
Contributor
Merge ProtectionsYour pull request matches the following merge protections and will not be merged until they are valid. 🔴 ⛓️ Depends-On RequirementsWaiting for
This rule is failing.Requirement based on the presence of
🔴 👀 Review RequirementsWaiting for
This rule is failing.
🔴 🔎 ReviewsWaiting for
This rule is failing.
🟢 🤖 Continuous IntegrationWonderful, this rule succeeded.
🟢 Enforce conventional commitWonderful, this rule succeeded.Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/
🟢 📕 PR descriptionWonderful, this rule succeeded.
|
jd
force-pushed
the
devs/jd/worktree-rust-port/introduce-commandcontext-queue-freeze-prelude--1b272570
branch
from
32cbcd9 to
c542b1f
Compare
jd
force-pushed
the
devs/jd/worktree-rust-port/consolidate-ci-env-scrubber-shared-testing-module--cd8c8441
branch
from
9484593 to
3e6ba1c
Compare
Member
Author
Revision history
|
…odule `with_ci_env` (clear every CI-provider env var before applying test overrides) lived in two copies — one inside the `tests` sub-module of `detector.rs`, one inside `scopes_send.rs` (which also had a `with_ci_env_async` counterpart). Both spelled the same 10-var list inline; both were drifting candidates. Extract to a new `crate::testing` (`#[cfg(test)] mod testing`) with the env-var list named as a const, sync + async variants behind one helper that builds the override list. Each test module now does a plain `use crate::testing::with_ci_env;`. Net `-71 / +51`. No behavior change; the existing 49 `mergify-ci` tests still pass. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> Change-Id: Icd8c84417ad51b242cc8d9664d1cd40fff744497
jd
force-pushed
the
devs/jd/worktree-rust-port/consolidate-ci-env-scrubber-shared-testing-module--cd8c8441
branch
from
3e6ba1c to
6d57a9c
Compare
jd
force-pushed
the
devs/jd/worktree-rust-port/introduce-commandcontext-queue-freeze-prelude--1b272570
branch
from
c542b1f to
141fec6
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
with_ci_env(clear every CI-provider env var before applyingtest overrides) lived in two copies — one inside the
testssub-module of
detector.rs, one insidescopes_send.rs(whichalso had a
with_ci_env_asynccounterpart). Both spelled the same10-var list inline; both were drifting candidates.
Extract to a new
crate::testing(#[cfg(test)] mod testing) withthe env-var list named as a const, sync + async variants behind one
helper that builds the override list. Each test module now does a
plain
use crate::testing::with_ci_env;.Net
-71 / +51. No behavior change; the existing 49mergify-citests still pass.
Co-Authored-By: Claude Opus 4.7 noreply@anthropic.com
Depends-On: #1441