From d1275f72d6fc4299f341be3d7c301f9d3d4fd155 Mon Sep 17 00:00:00 2001 From: morluto <76467478+morluto@users.noreply.github.com> Date: Fri, 20 Nov 2026 07:31:23 -0500 Subject: [PATCH] test(artifacts): consolidate reader ordering and coverage checks (#12774) --- .../ArtifactTraversalObservation.test.ts | 25 ++------- src/artifacts/OrderedReads.test.ts | 55 +++++++------------ 2 files changed, 25 insertions(+), 55 deletions(-) diff --git a/src/artifacts/ArtifactTraversalObservation.test.ts b/src/artifacts/ArtifactTraversalObservation.test.ts index 2d590d4ec1..5f46613b5f 100644 --- a/src/artifacts/ArtifactTraversalObservation.test.ts +++ b/src/artifacts/ArtifactTraversalObservation.test.ts @@ -46,28 +46,13 @@ const drain = async (iterable: AsyncIterable) => { }; describe("ArtifactTraversalObservation", () => { - it("is complete only when the reader declares complete coverage and finishes", async () => { - const traversal = new ArtifactTraversalObservation(); - expect( - await drain(traversal.entries(reader("zip", complete), undefined)), - ).toEqual(["a", "b"]); - expect(traversal.snapshot()).toEqual(complete); - }); - - it("reports a reader that ends without declaring coverage as unknown", async () => { - const traversal = new ArtifactTraversalObservation(); - await drain(traversal.entries(reader("ines", undefined), undefined)); - expect(traversal.snapshot()).toEqual({ - status: "unknown", - limitations: [ - "The ines reader ended its traversal without declaring coverage; members it did not list are unknown.", - ], - }); - }); - it("does not let one declared-complete traversal cover a silent one", async () => { const traversal = new ArtifactTraversalObservation(); - await drain(traversal.entries(reader("directory", complete), undefined)); + expect( + await drain(traversal.entries(reader("directory", complete), undefined)), + ).toEqual(["a", "b"]); + expect(traversal.snapshot()).toEqual(complete); + await drain(traversal.entries(reader("asar", undefined), undefined)); await drain(traversal.entries(reader("zip", complete), undefined)); expect(traversal.snapshot()).toEqual({ diff --git a/src/artifacts/OrderedReads.test.ts b/src/artifacts/OrderedReads.test.ts index 5e6afe006d..69b4e640de 100644 --- a/src/artifacts/OrderedReads.test.ts +++ b/src/artifacts/OrderedReads.test.ts @@ -46,51 +46,36 @@ const enumeration = ( }; describe("consumeWithOrderedReads", () => { - it("consumes in enumeration order when a later read finishes first", async () => { - const reads = new Map( - ["a", "b", "c"].map((item) => [item, controlled()]), - ); + it("bounds concurrent reads and consumes eligible entries in enumeration order", async () => { + const first = controlled(); + const second = controlled(); + const started: string[] = []; const consumed: string[] = []; const done = consumeWithOrderedReads( - enumeration(["a", "b", "c"]).items, - 8, - (item) => reads.get(item)!.promise, + enumeration(["a", "skip", "b", "c"]).items, + 2, + (item) => { + if (item === "skip") return undefined; + started.push(item); + if (item === "a") return first.promise; + if (item === "b") return second.promise; + return Promise.resolve("3"); + }, async (item, value) => { consumed.push(`${item}=${value}`); }, ); await drain(); - reads.get("c")!.resolve("3"); - reads.get("b")!.resolve("2"); + const startedBeforeEitherCompleted = [...started]; + second.resolve("2"); await drain(); - expect(consumed).toEqual([]); - reads.get("a")!.resolve("1"); + const consumedBeforeFirstCompleted = [...consumed]; + first.resolve("1"); await done; - expect(consumed).toEqual(["a=1", "b=2", "c=3"]); - }); - it("keeps at most width reads in flight and skips undefined reads", async () => { - let inFlight = 0; - let maxInFlight = 0; - const consumed: string[] = []; - await consumeWithOrderedReads( - enumeration(["a", "skip", "b", "c", "d", "e"]).items, - 2, - (item) => { - if (item === "skip") return undefined; - inFlight += 1; - maxInFlight = Math.max(maxInFlight, inFlight); - return drain().then(() => { - inFlight -= 1; - return item; - }); - }, - async (item) => { - consumed.push(item); - }, - ); - expect(maxInFlight).toBe(2); - expect(consumed).toEqual(["a", "b", "c", "d", "e"]); + expect(startedBeforeEitherCompleted).toEqual(["a", "b"]); + expect(consumedBeforeFirstCompleted).toEqual([]); + expect(consumed).toEqual(["a=1", "b=2", "c=3"]); }); it("reports an earlier read failure before a later one", async () => {