Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 11 additions & 4 deletions backend/test/helpers/opencode-binary.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ const VERSION_TIMEOUT_MS = 5000
const SERVE_READY_TIMEOUT_MS = 60000
const SERVE_POLL_INTERVAL_MS = 250
const RUN_TIMEOUT_MS = 90000
const STOP_TIMEOUT_MS = 10000
const STOP_TIMEOUT_MS = 5000
const KILL_CONFIRM_MS = 2000

const OPENCODE_BINARY_CANDIDATES = ['opencode', '/usr/local/bin/opencode', '/opt/opencode/bin/opencode']

Expand Down Expand Up @@ -205,7 +206,10 @@ export async function startOpenCodeServe(options: OpenCodeServeOptions = {}): Pr
if (child.exitCode === null && child.signalCode === null) {
child.kill('SIGTERM')
await Promise.race([once(child, 'close'), delay(STOP_TIMEOUT_MS)])
if (child.exitCode === null && child.signalCode === null) child.kill('SIGKILL')
if (child.exitCode === null && child.signalCode === null) {
child.kill('SIGKILL')
await Promise.race([once(child, 'close'), delay(KILL_CONFIRM_MS)])
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
}
}

Expand All @@ -219,8 +223,11 @@ export async function startOpenCodeServe(options: OpenCodeServeOptions = {}): Pr
readOutput: () => output,
terminate,
stop: async () => {
await terminate()
await removeOwnedDirectories()
try {
await terminate()
} finally {
await removeOwnedDirectories()
}
},
}
}
4 changes: 4 additions & 0 deletions backend/test/setup.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import { beforeAll, afterAll } from 'vitest'

for (const key of Object.keys(process.env)) {
if (key !== 'MSB_PATH' && /^(SANDBOX|MSB)_/.test(key)) delete process.env[key]
}

const originalEnv: Record<string, string | undefined> = {}

beforeAll(() => {
Expand Down