Skip to content

test(diagnostics): fix macOS catalog async fixtures #8136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lidge-jun merged 1 commit into from
Nov 3, 2026
Merged

test(diagnostics): fix macOS catalog async fixtures #8136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions scripts/diagnostics/windows-version-control/tests/async_contracts.test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,8 @@ fn invalidation_and_stopped_source_discard_late_catalogs() {
async function loadCase(change,phase) {
let current = phase!=='before-call', release, entered, executions=0;
const enteredPromise=new Promise(resolve=>{entered=resolve});
const deps={commandCandidates:()=>['C:\\fixture\\codex.exe'],
// Use the real fixture executable so macOS can validate the candidate.
const deps={commandCandidates:()=>[process.env.CODEX_CLI_PATH],
execFile:()=>new Promise(resolve=>{executions++;release=resolve;entered()})};
const pending=bundled.loadBundledCodexCatalogAsync(deps,()=>current);
const mutate=()=>{if(change==='invalidate')bundled.invalidateBundledCatalogCache();else current=false};
Expand Down Expand Up @@ -475,16 +476,19 @@ fn refresh_deadline_settles_an_uncooperative_executor_and_allows_the_next_load()
const realTimeout = globalThis.setTimeout;
globalThis.setTimeout = (callback,delay,...args)=>realTimeout(callback,delay===45000?20:delay,...args);
const keepAlive = setInterval(()=>{},100);
const expired = await bundled.loadBundledCodexCatalogAsync({commandCandidates:()=>['C:\\fixture\\codex.exe'],
execFile:()=>new Promise(()=>{})});
let entered = false, aborted = false;
const expired = await bundled.loadBundledCodexCatalogAsync({commandCandidates:()=>[process.env.CODEX_CLI_PATH],
execFile:(_file,_args,options)=>{entered=true; options.signal.addEventListener('abort',()=>{aborted=true}); return new Promise(()=>{})}});
clearInterval(keepAlive);
globalThis.setTimeout = realTimeout;
const fresh = await bundled.loadBundledCodexCatalogAsync({commandCandidates:()=>['C:\\fixture\\codex.exe'],
const fresh = await bundled.loadBundledCodexCatalogAsync({commandCandidates:()=>[process.env.CODEX_CLI_PATH],
execFile:async()=>JSON.stringify(catalog)});
return {expired:expired===null,fresh:fresh?.models.map(row=>row.slug)};
return {expired:expired===null,entered,aborted,fresh:fresh?.models.map(row=>row.slug)};
"#,
);
assert_eq!(result["expired"], true);
assert_eq!(result["entered"], true);
assert_eq!(result["aborted"], true);
assert_eq!(
result["fresh"],
serde_json::json!(["gpt-5.5", "gpt-5.6-sol"])
Expand Down
Loading