Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(test): r3-l1 make failed fixture disposal terminal

Josué7f117434145f
diff --git a/tests/e2e/gfsUploadV2Fixtures.test.ts b/tests/e2e/gfsUploadV2Fixtures.test.ts
index db26d18b6..8bb51759d 100644
--- a/tests/e2e/gfsUploadV2Fixtures.test.ts
+++ b/tests/e2e/gfsUploadV2Fixtures.test.ts
@@ -1,6 +1,16 @@
import { afterEach, describe, expect, it } from 'vitest'
import { existsSync } from 'node:fs'
-import { mkdir, readdir, rename, rmdir, stat, symlink, unlink, writeFile } from 'node:fs/promises'
+import {
+ type FileHandle,
+ mkdir,
+ readdir,
+ rename,
+ rmdir,
+ stat,
+ symlink,
+ unlink,
+ writeFile,
+} from 'node:fs/promises'
import os from 'node:os'
import path from 'node:path'
import {
@@ -8,6 +18,7 @@ import {
createOversizedDiskUploadFixture,
removeDiskUploadFixture,
setAfterFixtureHandleForTest,
+ setFixtureHandleForTest,
sha256File,
} from './gfsUploadV2Fixtures.js'
@@ -28,11 +39,35 @@ async function removeKnownFixtureDirectory(directory: string, fileNames: string[
if (existsSync(directory)) await rmdir(directory)
}
+function useScriptedFixtureHandle(script: {
+ truncate?: (length: number, call: number) => Promise<void> | void
+ close?: (call: number, handle: FileHandle) => Promise<void> | void
+}): { truncate: number; close: number } {
+ const calls = { truncate: 0, close: 0 }
+ setFixtureHandleForTest(handle => ({
+ async truncate(length: number): Promise<void> {
+ calls.truncate += 1
+ await script.truncate?.(length, calls.truncate)
+ await handle.truncate(length)
+ },
+ async close(): Promise<void> {
+ calls.close += 1
+ if (script.close) {
+ await script.close(calls.close, handle)
+ return
+ }
+ await handle.close()
+ },
+ }))
+ return calls
+}
+
describe('GFS Upload v2 disk fixtures', () => {
const fixtures: Array<Awaited<ReturnType<typeof createDiskUploadFixture>>> = []
afterEach(async () => {
setAfterFixtureHandleForTest?.(undefined)
+ setFixtureHandleForTest(undefined)
for (const fixture of fixtures.splice(0)) {
await removeDiskUploadFixture(fixture).catch(() => undefined)
await removeKnownFixtureDirectory(fixture.directory, [fixture.fileName]).catch(
@@ -190,6 +225,84 @@ describe('GFS Upload v2 disk fixtures', () => {
expect((await stat(fixture.filePath)).size).toBe(0)
})
+ it('keeps a truncate-failure disposal terminal after recovery close succeeds', async () => {
+ const truncateFailure = new Error('synthetic cleanup truncate failure')
+ const calls = useScriptedFixtureHandle({
+ truncate: (_length, call) => {
+ if (call === 2) throw truncateFailure
+ },
+ })
+ const fixture = await createDiskUploadFixture(1, '.bin', 'cleanup-truncate-failure')
+
+ try {
+ await expect(removeDiskUploadFixture(fixture)).rejects.toBe(truncateFailure)
+ expect(calls).toEqual({ truncate: 2, close: 1 })
+
+ await expect(removeDiskUploadFixture(fixture)).rejects.toBe(truncateFailure)
+ expect(calls).toEqual({ truncate: 2, close: 1 })
+ } finally {
+ await removeKnownFixtureDirectory(fixture.directory, [fixture.fileName])
+ }
+ })
+
+ it('preserves close context when truncate failure recovery cannot close the handle', async () => {
+ const truncateFailure = new Error('synthetic cleanup truncate failure')
+ const closeFailure = new Error('synthetic cleanup close failure')
+ const calls = useScriptedFixtureHandle({
+ truncate: (_length, call) => {
+ if (call === 2) throw truncateFailure
+ },
+ close: async (call, handle) => {
+ if (call === 1) throw closeFailure
+ if (call === 2) {
+ await handle.close()
+ return
+ }
+ throw new Error('dispose retried a terminally failed handle')
+ },
+ })
+ const fixture = await createDiskUploadFixture(1, '.bin', 'cleanup-truncate-close-failure')
+
+ try {
+ const firstError = await removeDiskUploadFixture(fixture).catch((error: unknown) => error)
+ expect(firstError).toBeInstanceOf(AggregateError)
+ expect((firstError as AggregateError).errors).toEqual([truncateFailure, closeFailure])
+ expect(calls).toEqual({ truncate: 2, close: 1 })
+
+ const secondError = await removeDiskUploadFixture(fixture).catch((error: unknown) => error)
+ expect(secondError).toBe(firstError)
+ expect(calls).toEqual({ truncate: 2, close: 2 })
+
+ const thirdError = await removeDiskUploadFixture(fixture).catch((error: unknown) => error)
+ expect(thirdError).toBe(firstError)
+ expect(calls).toEqual({ truncate: 2, close: 2 })
+ } finally {
+ await removeKnownFixtureDirectory(fixture.directory, [fixture.fileName])
+ }
+ })
+
+ it('marks a neutralized fixture disposed after close recovery succeeds', async () => {
+ const closeFailure = new Error('synthetic cleanup close failure')
+ const calls = useScriptedFixtureHandle({
+ close: async (call, handle) => {
+ if (call === 1) throw closeFailure
+ await handle.close()
+ },
+ })
+ const fixture = await createDiskUploadFixture(1, '.bin', 'cleanup-close-failure')
+
+ try {
+ await expect(removeDiskUploadFixture(fixture)).rejects.toBe(closeFailure)
+ expect((await stat(fixture.filePath)).size).toBe(0)
+ expect(calls).toEqual({ truncate: 2, close: 2 })
+
+ await expect(removeDiskUploadFixture(fixture)).resolves.toBeUndefined()
+ expect(calls).toEqual({ truncate: 2, close: 2 })
+ } finally {
+ await removeKnownFixtureDirectory(fixture.directory, [fixture.fileName])
+ }
+ })
+
it('validates before creating a fixture directory', async () => {
const before = await fixtureDirectories()
await expect(createOversizedDiskUploadFixture('.bin', 'invalid-product', 0)).rejects.toThrow(
diff --git a/tests/e2e/gfsUploadV2Fixtures.ts b/tests/e2e/gfsUploadV2Fixtures.ts
index 6409d17fd..73667f883 100644
--- a/tests/e2e/gfsUploadV2Fixtures.ts
+++ b/tests/e2e/gfsUploadV2Fixtures.ts
@@ -22,13 +22,23 @@ export interface DiskUploadFixture {
sha256: string
}
+interface FixtureHandle {
+ truncate(length: number): Promise<void>
+ close(): Promise<void>
+}
+
interface FixtureLease {
- handle: FileHandle
- state: 'active' | 'disposed'
+ handle: FixtureHandle
+ state: 'active' | 'disposed' | 'neutralize-failed-closed' | 'close-failed'
+ neutralized: boolean
+ failure?: unknown
}
const fixtureLeases = new WeakMap<DiskUploadFixture, FixtureLease>()
let afterFixtureHandleForTest: ((fixture: DiskUploadFixture) => Promise<void> | void) | undefined
+let fixtureHandleForTest:
+ | ((handle: FileHandle, fixture: DiskUploadFixture) => FixtureHandle)
+ | undefined
/** Test-only seam for exercising cleanup after a failure that follows handle acquisition. */
export function setAfterFixtureHandleForTest(
@@ -37,6 +47,13 @@ export function setAfterFixtureHandleForTest(
afterFixtureHandleForTest = hook
}
+/** Test-only seam for exercising retained-handle disposal failures. */
+export function setFixtureHandleForTest(
+ hook: ((handle: FileHandle, fixture: DiskUploadFixture) => FixtureHandle) | undefined
+): void {
+ fixtureHandleForTest = hook
+}
+
/**
* Creates a deterministic sparse, zero-filled fixture on disk. Playwright
* receives only the path, never a 200 MiB Buffer or ArrayBuffer.
@@ -97,9 +114,14 @@ async function createFixture(
byteLength,
sha256: '',
}
- fixtureLeases.set(fixture, { handle, state: 'active' })
+ const ownedHandle = fixtureHandleForTest?.(handle, fixture) ?? handle
+ fixtureLeases.set(fixture, {
+ handle: ownedHandle,
+ state: 'active',
+ neutralized: false,
+ })
await afterFixtureHandleForTest?.(fixture)
- await handle.truncate(byteLength)
+ await ownedHandle.truncate(byteLength)
fixture.sha256 = await sha256File(filePath)
return fixture
} catch (error) {
@@ -137,16 +159,73 @@ async function disposeFixtureLease(fixture: DiskUploadFixture): Promise<void> {
throw new Error(`refusing to neutralize an unowned GFS v2 fixture: ${fixture.filePath}`)
}
if (lease.state === 'disposed') return
+ if (lease.state === 'neutralize-failed-closed') {
+ throw (
+ lease.failure ??
+ new Error(`GFS v2 fixture disposal failed without a recorded cause: ${fixture.filePath}`)
+ )
+ }
+ if (lease.state === 'close-failed') {
+ await retryCloseAfterFailure(fixture, lease)
+ return
+ }
try {
await lease.handle.truncate(0)
+ lease.neutralized = true
await lease.handle.close()
lease.state = 'disposed'
} catch (error) {
- try {
- await lease.handle.close()
- } catch {
- // Preserve the original failure; this test-only helper has no pathname fallback.
- }
- throw error
+ await closeAfterDisposalFailure(lease, error)
+ }
+}
+
+async function closeAfterDisposalFailure(lease: FixtureLease, failure: unknown): Promise<never> {
+ try {
+ await lease.handle.close()
+ } catch (closeError) {
+ lease.failure = combineFixtureDisposalFailures(lease.neutralized, failure, closeError)
+ lease.state = 'close-failed'
+ throw lease.failure
+ }
+ if (lease.neutralized) {
+ lease.state = 'disposed'
+ } else {
+ lease.failure = failure
+ lease.state = 'neutralize-failed-closed'
}
+ throw failure
+}
+
+async function retryCloseAfterFailure(
+ fixture: DiskUploadFixture,
+ lease: FixtureLease
+): Promise<void> {
+ const previousFailure =
+ lease.failure ??
+ new Error(`GFS v2 fixture disposal failed without a recorded cause: ${fixture.filePath}`)
+ try {
+ await lease.handle.close()
+ } catch (closeError) {
+ lease.failure = combineFixtureDisposalFailures(lease.neutralized, previousFailure, closeError)
+ throw lease.failure
+ }
+ if (lease.neutralized) {
+ lease.state = 'disposed'
+ return
+ }
+ lease.state = 'neutralize-failed-closed'
+ throw previousFailure
+}
+
+function combineFixtureDisposalFailures(
+ neutralized: boolean,
+ failure: unknown,
+ closeError: unknown
+): AggregateError {
+ return new AggregateError(
+ [failure, closeError],
+ neutralized
+ ? 'failed to close neutralized GFS v2 fixture'
+ : 'failed to neutralize and close GFS v2 fixture'
+ )
}
diff --git a/tests/e2e/package-lock.json b/tests/e2e/package-lock.json
index 6aa3b2259..e42f20acd 100644
--- a/tests/e2e/package-lock.json
+++ b/tests/e2e/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-e2e-tests",
- "version": "0.1.72",
+ "version": "0.1.73",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-e2e-tests",
- "version": "0.1.72",
+ "version": "0.1.73",
"devDependencies": {
"@types/jsonwebtoken": "^9.0.10",
"@types/node": "^22.0.0",
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
index fa7c77be8..9b98d35fb 100644
--- a/tests/e2e/package.json
+++ b/tests/e2e/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-e2e-tests",
- "version": "0.1.72",
+ "version": "0.1.73",
"private": true,
"type": "module",
"scripts": {