Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(test): r4-h2 make fixture disposal single-flight
Josué280226a897a6
diff --git a/tests/e2e/gfsUploadV2FixtureLease.ts b/tests/e2e/gfsUploadV2FixtureLease.tsindex c37b82fb5..619089fcc 100644--- a/tests/e2e/gfsUploadV2FixtureLease.ts+++ b/tests/e2e/gfsUploadV2FixtureLease.ts@@ -11,9 +11,11 @@ export interface FixtureHandle {interface FixtureLease {handle: FixtureHandle- state: 'active' | 'disposed' | 'neutralize-failed-closed' | 'close-failed'+ state: 'active' | 'disposing' | 'disposed' | 'neutralize-failed-closed' | 'close-failed'neutralized: boolean+ disposeInFlight?: Promise<void>failure?: unknown+ neutralizeFailure?: unknown}const fixtureLeases = new WeakMap<FixtureLeaseTarget, FixtureLease>()@@ -56,6 +58,20 @@ export async function disposeFixtureLeaseForTest(fixture: FixtureLeaseTarget): Pif (!lease) {throw new Error(`refusing to neutralize an unowned GFS v2 fixture: ${fixture.filePath}`)}+ if (lease.disposeInFlight) return lease.disposeInFlight+ const operation = runFixtureLeaseDisposal(fixture, lease)+ lease.disposeInFlight = operation+ try {+ await operation+ } finally {+ if (lease.disposeInFlight === operation) lease.disposeInFlight = undefined+ }+}++async function runFixtureLeaseDisposal(+ fixture: FixtureLeaseTarget,+ lease: FixtureLease+): Promise<void> {if (lease.state === 'disposed') returnif (lease.state === 'neutralize-failed-closed') {throw (@@ -67,17 +83,28 @@ export async function disposeFixtureLeaseForTest(fixture: FixtureLeaseTarget): Pawait retryCloseAfterFailure(fixture, lease)return}+ if (lease.state === 'disposing') {+ throw new Error(`GFS v2 fixture disposal is already in progress: ${fixture.filePath}`)+ }+ lease.state = 'disposing'try {await lease.handle.truncate(0)lease.neutralized = true+ } catch (error) {+ await closeAfterNeutralizeFailure(lease, error)+ }+ try {await lease.handle.close()lease.state = 'disposed'} catch (error) {- await closeAfterDisposalFailure(lease, error)+ lease.failure = error+ lease.state = 'close-failed'+ throw error}}-async function closeAfterDisposalFailure(lease: FixtureLease, failure: unknown): Promise<never> {+async function closeAfterNeutralizeFailure(lease: FixtureLease, failure: unknown): Promise<never> {+ lease.neutralizeFailure = failuretry {await lease.handle.close()} catch (closeError) {@@ -101,6 +128,7 @@ async function retryCloseAfterFailure(const previousFailure =lease.failure ??new Error(`GFS v2 fixture disposal failed without a recorded cause: ${fixture.filePath}`)+ const neutralizeFailure = lease.neutralizeFailure ?? previousFailuretry {await lease.handle.close()} catch (closeError) {@@ -112,7 +140,8 @@ async function retryCloseAfterFailure(return}lease.state = 'neutralize-failed-closed'- throw previousFailure+ lease.failure = neutralizeFailure+ throw neutralizeFailure}function combineFixtureDisposalFailures(diff --git a/tests/e2e/gfsUploadV2Fixtures.test.ts b/tests/e2e/gfsUploadV2Fixtures.test.tsindex 5a63fe29d..232a5ad6f 100644--- a/tests/e2e/gfsUploadV2Fixtures.test.ts+++ b/tests/e2e/gfsUploadV2Fixtures.test.ts@@ -62,6 +62,28 @@ function useScriptedFixtureHandle(script: {return calls}+function deferred(): {+ promise: Promise<void>+ resolve: () => void+ reject: (error: unknown) => void+} {+ let resolve!: () => void+ let reject!: (error: unknown) => void+ const promise = new Promise<void>((resolvePromise, rejectPromise) => {+ resolve = resolvePromise+ reject = rejectPromise+ })+ return { promise, resolve, reject }+}++async function settledReasons(promises: Array<Promise<void>>): Promise<unknown[]> {+ const results = await Promise.allSettled(promises)+ return results.map(result => {+ expect(result.status).toBe('rejected')+ return (result as PromiseRejectedResult).reason+ })+}+describe('GFS Upload v2 disk fixtures', () => {const fixtures: Array<Awaited<ReturnType<typeof createDiskUploadFixture>>> = []@@ -318,6 +340,165 @@ describe('GFS Upload v2 disk fixtures', () => {expect((await stat(fixture.filePath)).size).toBe(0)})+ it('single-flights two concurrent successful disposals', async () => {+ const entered = deferred()+ const release = deferred()+ const calls = useScriptedFixtureHandle({+ truncate: async (_length, call) => {+ if (call === 2) {+ entered.resolve()+ await release.promise+ }+ },+ })+ const fixture = await createDiskUploadFixture(1, '.bin', 'cleanup-concurrent-success')++ try {+ const first = removeDiskUploadFixture(fixture)+ await entered.promise+ const second = removeDiskUploadFixture(fixture)+ release.resolve()+ await expect(Promise.all([first, second])).resolves.toEqual([undefined, undefined])+ expect(calls).toEqual({ truncate: 2, close: 1 })+ await expect(removeDiskUploadFixture(fixture)).resolves.toBeUndefined()+ expect(calls).toEqual({ truncate: 2, close: 1 })+ } finally {+ await removeKnownFixtureDirectory(fixture.directory, [fixture.fileName])+ }+ })++ it('single-flights many concurrent successful disposals', async () => {+ const entered = deferred()+ const release = deferred()+ const calls = useScriptedFixtureHandle({+ truncate: async (_length, call) => {+ if (call === 2) {+ entered.resolve()+ await release.promise+ }+ },+ })+ const fixture = await createDiskUploadFixture(1, '.bin', 'cleanup-many-concurrent-success')++ try {+ const first = removeDiskUploadFixture(fixture)+ await entered.promise+ const joined = Array.from({ length: 8 }, () => removeDiskUploadFixture(fixture))+ release.resolve()+ await expect(Promise.all([first, ...joined])).resolves.toEqual(+ Array.from({ length: 9 }, () => undefined)+ )+ expect(calls).toEqual({ truncate: 2, close: 1 })+ } finally {+ await removeKnownFixtureDirectory(fixture.directory, [fixture.fileName])+ }+ })++ it('single-flights concurrent truncate failure and terminal closed recovery', async () => {+ const entered = deferred()+ const release = deferred()+ const truncateFailure = new Error('synthetic concurrent truncate failure')+ const calls = useScriptedFixtureHandle({+ truncate: async (_length, call) => {+ if (call === 2) {+ entered.resolve()+ await release.promise+ throw truncateFailure+ }+ },+ })+ const fixture = await createDiskUploadFixture(1, '.bin', 'cleanup-concurrent-truncate-failure')++ try {+ const first = removeDiskUploadFixture(fixture)+ await entered.promise+ const second = removeDiskUploadFixture(fixture)+ release.resolve()+ const reasons = await settledReasons([first, second])+ expect(reasons).toEqual([truncateFailure, 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('single-flights concurrent close failure after successful neutralization', async () => {+ const entered = deferred()+ const release = deferred()+ const closeFailure = new Error('synthetic concurrent close failure')+ const calls = useScriptedFixtureHandle({+ close: async (call, handle) => {+ if (call === 1) {+ entered.resolve()+ await release.promise+ throw closeFailure+ }+ await handle.close()+ },+ })+ const fixture = await createDiskUploadFixture(1, '.bin', 'cleanup-concurrent-close-failure')++ try {+ const first = removeDiskUploadFixture(fixture)+ await entered.promise+ const second = removeDiskUploadFixture(fixture)+ release.resolve()+ const reasons = await settledReasons([first, second])+ expect(reasons).toEqual([closeFailure, closeFailure])+ expect(calls).toEqual({ truncate: 2, close: 1 })++ await expect(removeDiskUploadFixture(fixture)).resolves.toBeUndefined()+ 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('single-flights concurrent truncate and recovery-close failure', async () => {+ const entered = deferred()+ const release = deferred()+ const truncateFailure = new Error('synthetic concurrent truncate failure')+ const closeFailure = new Error('synthetic concurrent close failure')+ const calls = useScriptedFixtureHandle({+ truncate: async (_length, call) => {+ if (call === 2) {+ entered.resolve()+ await release.promise+ throw truncateFailure+ }+ },+ close: async (call, handle) => {+ if (call === 1) throw closeFailure+ await handle.close()+ },+ })+ const fixture = await createDiskUploadFixture(1, '.bin', 'cleanup-concurrent-truncate-close')++ try {+ const first = removeDiskUploadFixture(fixture)+ await entered.promise+ const second = removeDiskUploadFixture(fixture)+ release.resolve()+ const reasons = await settledReasons([first, second])+ expect(reasons[0]).toBeInstanceOf(AggregateError)+ expect(reasons[1]).toBe(reasons[0])+ expect((reasons[0] as AggregateError).errors).toEqual([truncateFailure, closeFailure])+ expect(calls).toEqual({ truncate: 2, close: 1 })++ await expect(removeDiskUploadFixture(fixture)).rejects.toBe(truncateFailure)+ expect(calls).toEqual({ truncate: 2, close: 2 })+ await expect(removeDiskUploadFixture(fixture)).rejects.toBe(truncateFailure)+ expect(calls).toEqual({ truncate: 2, close: 2 })+ } finally {+ await removeKnownFixtureDirectory(fixture.directory, [fixture.fileName])+ }+ })+it('keeps a truncate-failure disposal terminal after recovery close succeeds', async () => {const truncateFailure = new Error('synthetic cleanup truncate failure')const calls = useScriptedFixtureHandle({@@ -362,12 +543,10 @@ describe('GFS Upload v2 disk fixtures', () => {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)+ await expect(removeDiskUploadFixture(fixture)).rejects.toBe(truncateFailure)expect(calls).toEqual({ truncate: 2, close: 2 })- const thirdError = await removeDiskUploadFixture(fixture).catch((error: unknown) => error)- expect(thirdError).toBe(firstError)+ await expect(removeDiskUploadFixture(fixture)).rejects.toBe(truncateFailure)expect(calls).toEqual({ truncate: 2, close: 2 })} finally {await removeKnownFixtureDirectory(fixture.directory, [fixture.fileName])@@ -387,7 +566,7 @@ describe('GFS Upload v2 disk fixtures', () => {try {await expect(removeDiskUploadFixture(fixture)).rejects.toBe(closeFailure)expect((await stat(fixture.filePath)).size).toBe(0)- expect(calls).toEqual({ truncate: 2, close: 2 })+ expect(calls).toEqual({ truncate: 2, close: 1 })await expect(removeDiskUploadFixture(fixture)).resolves.toBeUndefined()expect(calls).toEqual({ truncate: 2, close: 2 })diff --git a/tests/e2e/package-lock.json b/tests/e2e/package-lock.jsonindex dc83acae0..647eb9bfa 100644--- a/tests/e2e/package-lock.json+++ b/tests/e2e/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-e2e-tests",- "version": "0.1.75",+ "version": "0.1.76","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-e2e-tests",- "version": "0.1.75",+ "version": "0.1.76","devDependencies": {"@types/jsonwebtoken": "^9.0.10","@types/node": "^22.0.0",diff --git a/tests/e2e/package.json b/tests/e2e/package.jsonindex 6a2a745a0..3424ea597 100644--- a/tests/e2e/package.json+++ b/tests/e2e/package.json@@ -1,6 +1,6 @@{"name": "clerum-e2e-tests",- "version": "0.1.75",+ "version": "0.1.76","private": true,"type": "module","scripts": {