Skip to content

Commit 176a0fa

Browse files
committed
test(api): clear leftover guard timers in openai-compatible abort tests
1 parent 2296b74 commit 176a0fa

1 file changed

Lines changed: 20 additions & 6 deletions

File tree

‎src/api/providers/__tests__/openai-compatible.spec.ts‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,23 @@ describe("OpenAICompatibleHandler", () => {
8989

9090
// A never-expiring signal (or a pre-aborted one) would fail this check:
9191
// the signal must fire on its own ~50ms timeout without any external abort.
92+
let guardTimer: ReturnType<typeof setTimeout> | undefined
9293
const fired = await Promise.race([
9394
new Promise<boolean>((resolve) => {
9495
abortSignal.addEventListener("abort", () => resolve(true), { once: true })
9596
}),
9697
new Promise<boolean>((resolve) => {
97-
setTimeout(() => resolve(false), 1000)
98+
guardTimer = setTimeout(() => resolve(false), 1000)
9899
}),
99100
])
100-
expect(fired).toBe(true)
101-
expect(abortSignal.aborted).toBe(true)
101+
try {
102+
expect(fired).toBe(true)
103+
expect(abortSignal.aborted).toBe(true)
104+
} finally {
105+
// Clear the guard timer so a winning abort event does not leave an
106+
// active timer behind that delays worker teardown.
107+
clearTimeout(guardTimer)
108+
}
102109
})
103110

104111
it("should merge signal and timeout when both are provided", async () => {
@@ -126,16 +133,23 @@ describe("OpenAICompatibleHandler", () => {
126133
expect(mergedSignal.aborted).toBe(false)
127134

128135
// With the caller signal left untouched, only the timeout component can fire
136+
let guardTimer: ReturnType<typeof setTimeout> | undefined
129137
const fired = await Promise.race([
130138
new Promise<boolean>((resolve) => {
131139
mergedSignal.addEventListener("abort", () => resolve(true), { once: true })
132140
}),
133141
new Promise<boolean>((resolve) => {
134-
setTimeout(() => resolve(false), 1000)
142+
guardTimer = setTimeout(() => resolve(false), 1000)
135143
}),
136144
])
137-
expect(fired).toBe(true)
138-
expect(mergedSignal.aborted).toBe(true)
145+
try {
146+
expect(fired).toBe(true)
147+
expect(mergedSignal.aborted).toBe(true)
148+
} finally {
149+
// Clear the guard timer so a winning abort event does not leave an
150+
// active timer behind that delays worker teardown.
151+
clearTimeout(guardTimer)
152+
}
139153
})
140154

141155
it("should work without options (backward compatible)", async () => {

0 commit comments

Comments
 (0)