@@ -8,6 +8,8 @@ import { type ModelRecord, litellmDefaultModelId, litellmDefaultModelInfo } from
88import { asyncStreamFrom , collectStream } from "../../../test-utils/stream"
99import { clearAllMocks } from "../../../test-utils/reset"
1010import { makeCreateMessageMetadata } from "../../../test-utils/api"
11+ import { withSettleGuard } from "../../../test-utils/settle-guard"
12+ import { flushMacrotasks } from "../../../test-utils/timers"
1113
1214// Mock vscode first to avoid import errors
1315vi . mock ( "vscode" , ( ) => ( {
@@ -1570,7 +1572,7 @@ describe("LiteLLMHandler", () => {
15701572 const completion = handler
15711573 . completePrompt ( "test prompt" , { abortSignal : controller . signal } )
15721574 . catch ( ( e : unknown ) => e )
1573- await new Promise ( ( resolve ) => setTimeout ( resolve , 10 ) )
1575+ await flushMacrotasks ( )
15741576 controller . abort ( )
15751577
15761578 const error = await completion
@@ -1788,13 +1790,7 @@ describe("LiteLLMHandler", () => {
17881790
17891791 // Bound the wait so a broken abort bridge fails this test fast (and fails
17901792 // the Stryker mutant) instead of hanging until the runner timeout.
1791- const error = await new Promise < unknown > ( ( resolve ) => {
1792- const deadline = setTimeout ( ( ) => resolve ( new Error ( "abort propagation deadline exceeded" ) ) , 3000 )
1793- collector . then ( ( result ) => {
1794- clearTimeout ( deadline )
1795- resolve ( result )
1796- } )
1797- } )
1793+ const error = await withSettleGuard ( collector , 3000 )
17981794 expect ( error ) . toBeInstanceOf ( Error )
17991795 expect ( ( error as Error ) . name ) . toBe ( "AbortError" )
18001796 expect ( ( error as Error ) . message ) . toBe ( "The LiteLLM request was aborted" )
@@ -1868,13 +1864,7 @@ describe("LiteLLMHandler", () => {
18681864
18691865 // Bound the wait so a broken discovery race fails this test fast
18701866 // (and fails the Stryker mutant) instead of hanging.
1871- const error = await new Promise < unknown > ( ( resolve ) => {
1872- const deadline = setTimeout ( ( ) => resolve ( new Error ( "discovery abort deadline exceeded" ) ) , 3000 )
1873- collector . then ( ( result ) => {
1874- clearTimeout ( deadline )
1875- resolve ( result )
1876- } )
1877- } )
1867+ const error = await withSettleGuard ( collector , 3000 )
18781868 expect ( error ) . toBeInstanceOf ( Error )
18791869 expect ( ( error as Error ) . name ) . toBe ( "AbortError" )
18801870 expect ( ( error as Error ) . message ) . toBe ( "The LiteLLM request was aborted" )
@@ -1960,13 +1950,7 @@ describe("LiteLLMHandler", () => {
19601950 await discoveryStarted
19611951 controller . abort ( )
19621952
1963- const error = await new Promise < unknown > ( ( resolve ) => {
1964- const deadline = setTimeout ( ( ) => resolve ( new Error ( "discovery abort deadline exceeded" ) ) , 3000 )
1965- collector . then ( ( result ) => {
1966- clearTimeout ( deadline )
1967- resolve ( result )
1968- } )
1969- } )
1953+ const error = await withSettleGuard ( collector , 3000 )
19701954 expect ( error ) . toBeInstanceOf ( Error )
19711955 expect ( ( error as Error ) . name ) . toBe ( "AbortError" )
19721956 expect ( ( error as Error ) . message ) . toBe ( "The LiteLLM request was aborted" )
@@ -2026,7 +2010,7 @@ describe("LiteLLMHandler", () => {
20262010 // an erroneous early settlement (e.g. the abort leaking into the
20272011 // sibling) settles `sibling` in a microtask, so an assertion
20282012 // right after attaching the callback could never observe it.
2029- await new Promise < void > ( ( resolve ) => setTimeout ( resolve , 0 ) )
2013+ await flushMacrotasks ( )
20302014 expect ( siblingSettled ) . toBe ( false )
20312015
20322016 // ...and settles normally once the shared discovery resolves.
@@ -2056,13 +2040,7 @@ describe("LiteLLMHandler", () => {
20562040 await discoveryStarted
20572041 controller . abort ( )
20582042
2059- const error = await new Promise < unknown > ( ( resolve ) => {
2060- const deadline = setTimeout ( ( ) => resolve ( new Error ( "discovery abort deadline exceeded" ) ) , 3000 )
2061- collector . then ( ( result ) => {
2062- clearTimeout ( deadline )
2063- resolve ( result )
2064- } )
2065- } )
2043+ const error = await withSettleGuard ( collector , 3000 )
20662044 expect ( error ) . toBeInstanceOf ( Error )
20672045 expect ( ( error as Error ) . name ) . toBe ( "AbortError" )
20682046 expect ( ( error as Error ) . message ) . toBe ( "The LiteLLM request was aborted" )
@@ -2075,19 +2053,13 @@ describe("LiteLLMHandler", () => {
20752053 // instead of the abort contract error.
20762054 vi . mocked ( getModels ) . mockImplementationOnce ( ( ) => new Promise < ModelRecord > ( ( ) => { } ) )
20772055
2078- const error = await new Promise < unknown > ( ( resolve ) => {
2079- const deadline = setTimeout ( ( ) => resolve ( new Error ( "timeout deadline exceeded" ) ) , 3000 )
2056+ const error = await withSettleGuard (
20802057 handler . completePrompt ( "test prompt" , { timeoutMs : 50 } ) . then (
2081- ( ) => {
2082- clearTimeout ( deadline )
2083- resolve ( new Error ( "completePrompt unexpectedly resolved" ) )
2084- } ,
2085- ( e ) => {
2086- clearTimeout ( deadline )
2087- resolve ( e )
2088- } ,
2089- )
2090- } )
2058+ ( ) => new Error ( "completePrompt unexpectedly resolved" ) ,
2059+ ( e : unknown ) => e ,
2060+ ) ,
2061+ 3000 ,
2062+ )
20912063 expect ( error ) . toBeInstanceOf ( Error )
20922064 expect ( ( error as Error ) . name ) . toBe ( "TimeoutError" )
20932065 expect ( ( error as Error ) . message ) . toBe ( "The LiteLLM model discovery timed out" )
@@ -2102,6 +2074,7 @@ describe("LiteLLMHandler", () => {
21022074 vi . mocked ( getModels ) . mockImplementationOnce (
21032075 ( ) =>
21042076 new Promise < ModelRecord > ( ( resolve ) => {
2077+ // eslint-disable-next-line no-restricted-globals -- vi.useFakeTimers drives this timer
21052078 setTimeout ( ( ) => resolve ( { [ litellmDefaultModelId ] : litellmDefaultModelInfo } ) , 50 )
21062079 } ) ,
21072080 )
0 commit comments