From d641f6f7a11335d234f056181ac41347b5cae5c8 Mon Sep 17 00:00:00 2001
From: Daniel Salazar <daniel.salazar@puter.com>
Date: Fri, 14 Aug 2026 11:05:25 -0700
Subject: [PATCH] tests: count only this test's dynamo reads in the
 block-window assertion (#3576)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The spy sits on the test server's shared dynamo client, so a raw call
count also picks up background work and the async tail of earlier tests
in the file — which made the block-window test flakily report a third
read. Each test runs in its own random namespace, so filtering the
spy's calls to that namespace removes the cross-talk without loosening
the assertion.

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 .../systemKv/SystemKVStore.readCache.test.ts     | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/backend/stores/systemKv/SystemKVStore.readCache.test.ts b/src/backend/stores/systemKv/SystemKVStore.readCache.test.ts
index bf00d18c5..f87edf258 100644
--- a/src/backend/stores/systemKv/SystemKVStore.readCache.test.ts
+++ b/src/backend/stores/systemKv/SystemKVStore.readCache.test.ts
@@ -74,6 +74,18 @@ describe('SystemKVStore read cache', () => {
     const sleep = (ms: number) =>
         new Promise((resolve) => setTimeout(resolve, ms));
 
+    /**
+     * The dynamo client is shared by the whole test server, so a spy on it
+     * also sees background work and the async tail of earlier tests. Only
+     * calls for this test's own namespace prove anything about this test.
+     */
+    const dynamoCallsHere = (spy: { mock: { calls: unknown[][] } }) =>
+        spy.mock.calls.filter(
+            (call) =>
+                (call[1] as { namespace?: string } | undefined)?.namespace ===
+                namespace,
+        );
+
     describe('get', () => {
         it('answers a repeat read without touching the underlying store', async () => {
             await seed('k', 'cached-value');
@@ -312,7 +324,7 @@ describe('SystemKVStore read cache', () => {
             await target.get({ key: 'k' }, opts);
             await settle();
             await target.get({ key: 'k' }, opts);
-            expect(blocked).toHaveBeenCalledTimes(2);
+            expect(dynamoCallsHere(blocked)).toHaveLength(2);
             blocked.mockRestore();
 
             await sleep(BLOCK_SECONDS * 1000 + 200);
@@ -322,7 +334,7 @@ describe('SystemKVStore read cache', () => {
             const after = vi.spyOn(server.clients.dynamo, 'get');
             const result = await target.get({ key: 'k' }, opts);
             expect(result.res).toBe('new');
-            expect(after).not.toHaveBeenCalled();
+            expect(dynamoCallsHere(after)).toHaveLength(0);
         });
     });