From dcc95f996a91596f4191d1172bcd367fdc5832a1 Mon Sep 17 00:00:00 2001 From: Paul Adelsbach Date: Thu, 25 Jun 2026 18:32:12 -0700 Subject: [PATCH] Fix failing NVM test under DMA --- test-refactor/client-server/wh_test_nvm_ops.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test-refactor/client-server/wh_test_nvm_ops.c b/test-refactor/client-server/wh_test_nvm_ops.c index 92ecb3020..2460877d1 100644 --- a/test-refactor/client-server/wh_test_nvm_ops.c +++ b/test-refactor/client-server/wh_test_nvm_ops.c @@ -190,7 +190,10 @@ static int _runNvmObjectTest(whClientContext* ctx, ctx, &server_rc, &avail_size, &avail_objects, &reclaim_size, &reclaim_objects)); WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK); - baseline = avail_objects; + /* Starting point for the test is available + reclaimable. + * NVM activity may recycle stale entries from prior tests, so + * `avail_objects` alone is not sufficient. */ + baseline = (whNvmId)(avail_objects + reclaim_objects); /* Add phase: fresh objects, no reclaim activity expected. */ for (i = 0; i < NVM_TEST_OBJECT_COUNT; i++) { @@ -266,7 +269,9 @@ static int _runNvmObjectTest(whClientContext* ctx, ctx, &server_rc, &avail_size, &avail_objects, &reclaim_size, &reclaim_objects)); WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK); - WH_TEST_ASSERT_RETURN(avail_objects == baseline); + /* Live-object count must match the baseline; see note above. */ + WH_TEST_ASSERT_RETURN( + (whNvmId)(avail_objects + reclaim_objects) == baseline); return WH_ERROR_OK; }