1 files changed, 33 insertions, 29 deletions

diff --git a/src/zenserver/cache/structuredcachestore.cpp b/src/zenserver/cache/structuredcachestore.cpp
index 0a2947b16..1b6eeca3a 100644
--- a/src/zenserver/cache/structuredcachestore.cpp
+++ b/src/zenserver/cache/structuredcachestore.cpp
@@ -1030,46 +1030,50 @@ TEST_CASE("z$.gc")
 	{
 		ScopedTemporaryDirectory TempDir;
 		GcManager				 Gc;
-		ZenCacheNamespace		 Zcs(Gc, *JobQueue, TempDir.Path() / "cache");
-		const auto				 Bucket = "rightintwo"sv;
-
-		std::vector<IoHash> Keys{CreateKey(1), CreateKey(2), CreateKey(3)};
-
-		for (const auto& Key : Keys)
 		{
-			IoBuffer Value = testutils::CreateBinaryCacheValue(128);
-			Zcs.Put(Bucket, Key, {.Value = Value});
-		}
-
-		{
-			GcContext GcCtx(GcClock::Now() - std::chrono::hours(2), GcClock::Now() - std::chrono::hours(2));
-			GcCtx.CollectSmallObjects(true);
+			ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache");
+			const auto		  Bucket = "rightintwo"sv;
 
-			Gc.CollectGarbage(GcCtx);
+			std::vector<IoHash> Keys{CreateKey(1), CreateKey(2), CreateKey(3)};
 
 			for (const auto& Key : Keys)
 			{
-				ZenCacheValue CacheValue;
-				const bool	  Exists = Zcs.Get(Bucket, Key, CacheValue);
-				CHECK(Exists);
+				IoBuffer Value = testutils::CreateBinaryCacheValue(128);
+				Zcs.Put(Bucket, Key, {.Value = Value});
 			}
-		}
 
-		// Move forward in time and collect again
-		{
-			GcContext GcCtx(GcClock::Now() + std::chrono::minutes(2), GcClock::Now() + std::chrono::minutes(2));
-			GcCtx.CollectSmallObjects(true);
+			{
+				GcContext GcCtx(GcClock::Now() - std::chrono::hours(2), GcClock::Now() - std::chrono::hours(2));
+				GcCtx.CollectSmallObjects(true);
 
-			Zcs.Flush();
-			Gc.CollectGarbage(GcCtx);
+				Gc.CollectGarbage(GcCtx);
 
-			for (const auto& Key : Keys)
-			{
-				ZenCacheValue CacheValue;
-				const bool	  Exists = Zcs.Get(Bucket, Key, CacheValue);
-				CHECK(!Exists);
+				for (const auto& Key : Keys)
+				{
+					ZenCacheValue CacheValue;
+					const bool	  Exists = Zcs.Get(Bucket, Key, CacheValue);
+					CHECK(Exists);
+				}
 			}
 
+			// Move forward in time and collect again
+			{
+				GcContext GcCtx(GcClock::Now() + std::chrono::minutes(2), GcClock::Now() + std::chrono::minutes(2));
+				GcCtx.CollectSmallObjects(true);
+
+				Zcs.Flush();
+				Gc.CollectGarbage(GcCtx);
+
+				for (const auto& Key : Keys)
+				{
+					ZenCacheValue CacheValue;
+					const bool	  Exists = Zcs.Get(Bucket, Key, CacheValue);
+					CHECK(!Exists);
+				}
+			}
+		}
+		{
+			ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache");
 			CHECK_EQ(0, Zcs.StorageSize().DiskSize);
 		}
 	}