From 4a2639e5586fa614bb309c5a273705d332d87349 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan.boberg@epicgames.com>
Date: Mon, 30 Mar 2026 10:29:54 +0200
Subject: reuse single MinIO instance across s3client integration test (#901)

Replace doctest SUBCASEs with sequential scoped blocks so the MinIO server is spawned once and torn down via RAII at scope exit, instead of being restarted for every subcase re-entry. Fixes flaky CI on macOS caused by repeated MinIO process start/stop.
---
 src/zenutil/cloud/s3client.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'src/zenutil/cloud/s3client.cpp')

diff --git a/src/zenutil/cloud/s3client.cpp b/src/zenutil/cloud/s3client.cpp
index 26d1023f4..c3404699d 100644
--- a/src/zenutil/cloud/s3client.cpp
+++ b/src/zenutil/cloud/s3client.cpp
@@ -885,7 +885,10 @@ TEST_CASE("s3client.minio_integration")
 {
 	using namespace std::literals;
 
-	// Spawn a local MinIO server
+	// Spawn a single MinIO server for the entire test case. Previously each SUBCASE re-entered
+	// the TEST_CASE from the top, spawning and killing MinIO per subcase — slow and flaky on
+	// macOS CI. Sequential sections avoid the re-entry while still sharing one MinIO instance
+	// that is torn down via RAII at scope exit.
 	MinioProcessOptions MinioOpts;
 	MinioOpts.Port		   = 19000;
 	MinioOpts.RootUser	   = "testuser";
@@ -893,11 +896,8 @@ TEST_CASE("s3client.minio_integration")
 
 	MinioProcess Minio(MinioOpts);
 	Minio.SpawnMinioServer();
-
-	// Pre-create the test bucket (creates a subdirectory in MinIO's data dir)
 	Minio.CreateBucket("integration-test");
 
-	// Configure S3Client for the test bucket
 	S3ClientOptions Opts;
 	Opts.BucketName					 = "integration-test";
 	Opts.Region						 = "us-east-1";
@@ -908,7 +908,7 @@ TEST_CASE("s3client.minio_integration")
 
 	S3Client Client(Opts);
 
-	SUBCASE("put_get_delete")
+	// -- put_get_delete -------------------------------------------------------
 	{
 		// PUT
 		std::string_view TestData = "hello, minio integration test!"sv;
@@ -937,14 +937,14 @@ TEST_CASE("s3client.minio_integration")
 		CHECK(HeadRes2.Status == HeadObjectResult::NotFound);
 	}
 
-	SUBCASE("head_not_found")
+	// -- head_not_found -------------------------------------------------------
 	{
 		S3HeadObjectResult Res = Client.HeadObject("nonexistent/key.dat");
 		CHECK(Res.IsSuccess());
 		CHECK(Res.Status == HeadObjectResult::NotFound);
 	}
 
-	SUBCASE("list_objects")
+	// -- list_objects ---------------------------------------------------------
 	{
 		// Upload several objects with a common prefix
 		for (int i = 0; i < 3; ++i)
@@ -979,7 +979,7 @@ TEST_CASE("s3client.minio_integration")
 		}
 	}
 
-	SUBCASE("multipart_upload")
+	// -- multipart_upload -----------------------------------------------------
 	{
 		// Create a payload large enough to exercise multipart (use minimum part size)
 		constexpr uint64_t PartSize	   = 5 * 1024 * 1024;  // 5 MB minimum
@@ -1006,7 +1006,7 @@ TEST_CASE("s3client.minio_integration")
 		Client.DeleteObject("multipart/large.bin");
 	}
 
-	SUBCASE("presigned_urls")
+	// -- presigned_urls -------------------------------------------------------
 	{
 		// Upload an object
 		std::string_view TestData = "presigned-url-test-data"sv;
@@ -1032,8 +1032,6 @@ TEST_CASE("s3client.minio_integration")
 		// Cleanup
 		Client.DeleteObject("presigned/test.txt");
 	}
-
-	Minio.StopMinioServer();
 }
 
 TEST_SUITE_END();
-- 
cgit v1.2.3