fix(test): reconcile base-drifted test expectations on release/v3.8.50 - #9634
diegosouzapw merged 4 commits into
Conversation
CI has run now, and every failure on it is also on the baseThis PR sat for six hours with no checks at all. Its workflow never triggered: Worth knowing because the PR read as The check that matters here is greenMerge integrity (changelog + generated skills) passes. That is the gate currently failing on #9632 and on the other open PRs, because Also green: Change Classification, semgrep, semgrep cloud, DAST smoke. Where the red comes fromI ran each failing gate against a throwaway worktree at the clean base tip (
Unit shard 1's 15 failures land in four files, none of them in this diff. Running those four directly:
Same eight failures. The eight extra tests are ones that could not be collected before, because the duplicate The two gates this PR's own changes land on both pass locally: Two things you may want separatelyNeither is in this diff and neither is fixed here.
#8890 added What this still does not claimThe 44 remaining unit failures named in the description are unchanged, and shard-level green is not reachable from this PR alone. What the branch does is take the tree from 3907 failures to 44 and from 26620 collected tests to 28189, and the numbers above are the same measurement done per-gate. |
Babysit audit trailChanges made (beyond the original 3 PR commits)
What remains red (pre-existing base issues, not in this PR's diff):
Key gates passing:
|
Babysit status update (iteration 3)The commit correctly scoped this PR down to just the test expectation drifts, since #9618 (migration renumber), #9632 (changelog format), and #9676 (combo module load via selection helper) each cover one of the original three fixes with better implementations. What this branch now carries
What remains red (all pre-existing base issues or handled by other PRs)
This PR cannot go fully green until its three sibling PRs land, which was always the design: unblock CI by having a branch where tests can actually load (the two bugs prevented each other's CI from running at all). Once #9618, #9632, and #9676 merge, this branch's remaining gate fixes will layer cleanly on top. |
Re-sync fork PR diegosouzapw#9634 with latest base (8 commits ahead). Resolved 5 test-file conflicts by accepting origin/release/v3.8.50 since the fork's purpose is reconciling test expectations with the current base. Refs diegosouzapw#9634
374cb48 to
1dcd588
Compare
|
Thanks for the PR. Please address the mandatory items (tests and/or merge blockers) in this branch, then rerun checks before /merge-prs. |
3 similar comments
|
Thanks for the PR. Please address the mandatory items (tests and/or merge blockers) in this branch, then rerun checks before /merge-prs. |
|
Thanks for the PR. Please address the mandatory items (tests and/or merge blockers) in this branch, then rerun checks before /merge-prs. |
|
Thanks for the PR. Please address the mandatory items (tests and/or merge blockers) in this branch, then rerun checks before /merge-prs. |
|
Obrigado pelo PR. Mantive a revisão de
|
1dcd588 to
b8736ef
Compare
Renumber the CCR block-store migration from 134 to 139, reconcile databases that already applied the legacy slot, and add regression coverage for both upgrade paths. Co-Authored-By: GPT-5 <noreply@openai.com>
Three other PRs already cover what this one was carrying. diegosouzapw#9618 renumbers the colliding ccr_blocks migration, diegosouzapw#9632 repairs the malformed aggregator changelog fragment, and diegosouzapw#9676 restores the combo module load by implementing the selection helper the import was reaching for, rather than deleting the caller the way this branch did. Keeping any of it here would put two files back on the same migration slot and overwrite a better fix with a worse one. What survives is the part none of them touch. Once the combo barrel loads again, three assertions in the context-window filter suite start failing: they demand that catalog-too-small targets be dropped, while the file's own header and its four neighbouring tests say those targets stay available as runtime fallback. The unresolved import was masking them. A new case pins the output-token limit as a genuine hard requirement so the relaxation cannot drift further. The provider count assertion kept one literal at the old value after the rest of the file moved to 198, so the partition check failed on a sum that was correct.
Rebase fix/release-v3850-basereds onto release/v3.8.50 resolving conflicts. The substantive changes (ccr_blocks renumber diegosouzapw#9618, aggregator changelog well-formedness diegosouzapw#9632, combo module load diegosouzapw#9676) are already covered on the release tip. Keep the release ccr-migration-renumber test so the renumbered 134->139 behavior stays covered; the rebased branch is a clean descendant of the release tip with no regressions. Co-authored-by: diegosouzapw <8016841+diegosouzapw@users.noreply.github.com>
b8736ef to
a097ae2
Compare
5133aad
into
diegosouzapw:release/v3.8.50
diegosouzapw#9634) * fix(combo): restore routing module load * fix(db): resolve ccr migration version collision Renumber the CCR block-store migration from 134 to 139, reconcile databases that already applied the legacy slot, and add regression coverage for both upgrade paths. Co-Authored-By: GPT-5 <noreply@openai.com> * fix(test): narrow this branch to the drifted test expectations Three other PRs already cover what this one was carrying. diegosouzapw#9618 renumbers the colliding ccr_blocks migration, diegosouzapw#9632 repairs the malformed aggregator changelog fragment, and diegosouzapw#9676 restores the combo module load by implementing the selection helper the import was reaching for, rather than deleting the caller the way this branch did. Keeping any of it here would put two files back on the same migration slot and overwrite a better fix with a worse one. What survives is the part none of them touch. Once the combo barrel loads again, three assertions in the context-window filter suite start failing: they demand that catalog-too-small targets be dropped, while the file's own header and its four neighbouring tests say those targets stay available as runtime fallback. The unresolved import was masking them. A new case pins the output-token limit as a genuine hard requirement so the relaxation cannot drift further. The provider count assertion kept one literal at the old value after the rest of the file moved to 198, so the partition check failed on a sum that was correct. * fix(release): restore base-relative reconcile to mergeable state Rebase fix/release-v3850-basereds onto release/v3.8.50 resolving conflicts. The substantive changes (ccr_blocks renumber diegosouzapw#9618, aggregator changelog well-formedness diegosouzapw#9632, combo module load diegosouzapw#9676) are already covered on the release tip. Keep the release ccr-migration-renumber test so the renumbered 134->139 behavior stays covered; the rebased branch is a clean descendant of the release tip with no regressions. Co-authored-by: diegosouzapw <8016841+diegosouzapw@users.noreply.github.com> --------- Co-authored-by: alexey.nazarov@softmg.ru <alexey.nazarov@softmg.ru> Co-authored-by: GPT-5 <noreply@openai.com> Co-authored-by: diegosouzapw <8016841+diegosouzapw@users.noreply.github.com>
fix/release-v3850-baseredsPR.This branch started as a base-red sweep and dropped everything another open PR already covers:
134_ccr_blocks→ 139 renumber9415-newapi-sub2api-aggregator-balance.mdwell-formednesspreferAntigravityConnectionsWithStoredProjectand repairs the import, restoring #8894. This branch deleted the caller instead, which loads the module by dropping the behaviourThe three assertions the module-load failure was hiding
The unresolved import stops
open-sse/services/combo.tsfrom loading at all, which masks three assertions intests/unit/combo-context-window-filter.test.ts. They demand that catalog-too-small targets be dropped. The same file's own header says the opposite:and four neighbouring tests that currently pass assert exactly that, including
all known-too-small context targets still fall back to strategy order. The file contradicts itself; the module-load failure is the only reason nobody has seen it.Measured locally against the same base, running only that file:
# pass 11 # fail 3# pass 11 # fail 3— same three# pass 15 # fail 0So #9676 will turn those three red the moment it lands, through no fault of its own. A new case,
output-token limits remain a hard compatibility requirement, pins the output-token limit as a genuine hard constraint so relaxing the context assertions cannot drift into accepting anything.The rest
providers-constants-split.test.tsmoved to 198 providers everywhere except the partition assertion, which kept the literal 197 and failed on a sum that was correct.oauth-providers-config.test.tswas still red afterraycastwent into the expected-keys list: the failing check compares the registry against the id map insrc/lib/oauth/constants/oauth.ts, and that map never got a raycast entry even thoughproviders/raycast.tsandRAYCAST_CONFIGhave both existed since the provider shipped. Adding the id is what closes it. Nothing in the application reads that map — the OAuth routes carry their own provider sets — so this aligns a naming table with the registry rather than enabling anything.probeUtilsre-export inlocalDb.ts.Merge order
This one depends on #9676. Until that lands,
combo.tsstill cannot load, so the combo tests here cannot run and CI stays red for that reason alone. Merging #9676 first and this immediately after leaves both green; merging this first changes nothing either way.Verified on every test file this PR touches, with #9618 and #9676 applied locally to simulate the post-merge base:
provider-translate-path-golden.test.tsalso fails, but it reads a differentPROVIDERS(fromopen-sse/config/constants.ts) and fails identically with this branch's changes reverted — pre-existing, not from here.