add timeout to server spawns in tests

1 files changed, 22 insertions, 22 deletions

diff --git a/src/zenserver-test/zenserver-test.cpp b/src/zenserver-test/zenserver-test.cpp
index 3195181d1..f690444e0 100644
--- a/src/zenserver-test/zenserver-test.cpp
+++ b/src/zenserver-test/zenserver-test.cpp
@@ -374,7 +374,7 @@ TEST_CASE("default.single")
 
 	ZEN_INFO("Waiting...");
 
-	Instance.WaitUntilReady();
+	CHECK(Instance.WaitUntilReady(2000));
 
 	std::atomic<uint64_t> RequestCount{0};
 	std::atomic<uint64_t> BatchCounter{0};
@@ -429,8 +429,8 @@ TEST_CASE("multi.basic")
 
 	ZEN_INFO("Waiting...");
 
-	Instance1.WaitUntilReady();
-	Instance2.WaitUntilReady();
+	CHECK(Instance1.WaitUntilReady(2000));
+	CHECK(Instance2.WaitUntilReady(2000));
 
 	std::atomic<uint64_t> RequestCount{0};
 	std::atomic<uint64_t> BatchCounter{0};
@@ -477,7 +477,7 @@ TEST_CASE("project.basic")
 	ZenServerInstance Instance1(TestEnv);
 	Instance1.SetTestDir(TestDir);
 	Instance1.SpawnServer(PortNumber);
-	Instance1.WaitUntilReady();
+	CHECK(Instance1.WaitUntilReady(2000));
 
 	std::atomic<uint64_t> RequestCount{0};
 
@@ -643,7 +643,7 @@ TEST_CASE("project.pipe")
 	ZenServerInstance Instance1(TestEnv);
 	Instance1.SetTestDir(TestDir);
 	Instance1.SpawnServer(PortNumber);
-	Instance1.WaitUntilReady();
+	CHECK(Instance1.WaitUntilReady(2000));
 
 	zen::LocalProjectClient LocalClient(PortNumber);
 
@@ -690,7 +690,7 @@ namespace utils {
 		{
 			Inst.SetTestDir(DataDir);
 			Inst.SpawnServer(Port, Args);
-			Inst.WaitUntilReady();
+			CHECK(Inst.WaitUntilReady(2000));
 		}
 	};
 
@@ -698,7 +698,7 @@ namespace utils {
 	{
 		Server.SetTestDir(Cfg.DataDir);
 		Server.SpawnServer(Cfg.Port, Cfg.Args);
-		Server.WaitUntilReady();
+		CHECK(Server.WaitUntilReady(2000));
 	}
 
 }  // namespace utils
@@ -720,7 +720,7 @@ TEST_CASE("zcache.basic")
 		ZenServerInstance Instance1(TestEnv);
 		Instance1.SetTestDir(TestDir);
 		Instance1.SpawnServer(PortNumber);
-		Instance1.WaitUntilReady();
+		CHECK(Instance1.WaitUntilReady(2000));
 
 		// Populate with some simple data
 
@@ -778,7 +778,7 @@ TEST_CASE("zcache.basic")
 		ZenServerInstance Instance1(TestEnv);
 		Instance1.SetTestDir(TestDir);
 		Instance1.SpawnServer(PortNumber);
-		Instance1.WaitUntilReady();
+		CHECK(Instance1.WaitUntilReady(2000));
 
 		// Retrieve data again
 
@@ -862,7 +862,7 @@ TEST_CASE("zcache.cbpackage")
 		ZenServerInstance Instance1(TestEnv);
 		Instance1.SetTestDir(TestDir);
 		Instance1.SpawnServer(PortNumber);
-		Instance1.WaitUntilReady();
+		CHECK(Instance1.WaitUntilReady(2000));
 
 		const std::string_view Bucket = "mosdef"sv;
 		zen::IoHash			   Key;
@@ -906,13 +906,13 @@ TEST_CASE("zcache.cbpackage")
 		ZenServerInstance RemoteInstance(TestEnv);
 		RemoteInstance.SetTestDir(RemoteDataDir);
 		RemoteInstance.SpawnServer(RemotePortNumber);
-		RemoteInstance.WaitUntilReady();
+		CHECK(RemoteInstance.WaitUntilReady(2000));
 
 		ZenServerInstance LocalInstance(TestEnv);
 		LocalInstance.SetTestDir(LocalDataDir);
 		LocalInstance.SpawnServer(LocalPortNumber,
 								  fmt::format("--upstream-thread-count=0 --upstream-zen-url=http://localhost:{}", RemotePortNumber));
-		LocalInstance.WaitUntilReady();
+		CHECK(LocalInstance.WaitUntilReady(2000));
 
 		const std::string_view Bucket = "mosdef"sv;
 		zen::IoHash			   Key;
@@ -969,13 +969,13 @@ TEST_CASE("zcache.cbpackage")
 		ZenServerInstance RemoteInstance(TestEnv);
 		RemoteInstance.SetTestDir(RemoteDataDir);
 		RemoteInstance.SpawnServer(RemotePortNumber);
-		RemoteInstance.WaitUntilReady();
+		CHECK(RemoteInstance.WaitUntilReady(2000));
 
 		ZenServerInstance LocalInstance(TestEnv);
 		LocalInstance.SetTestDir(LocalDataDir);
 		LocalInstance.SpawnServer(LocalPortNumber,
 								  fmt::format("--upstream-thread-count=0 --upstream-zen-url=http://localhost:{}", RemotePortNumber));
-		LocalInstance.WaitUntilReady();
+		CHECK(LocalInstance.WaitUntilReady(2000));
 
 		const std::string_view Bucket = "mosdef"sv;
 		zen::IoHash			   Key;
@@ -1460,7 +1460,7 @@ TEST_CASE("zcache.rpc")
 		ZenServerInstance Inst(TestEnv);
 		Inst.SetTestDir(TestDir);
 		Inst.SpawnServer(PortNumber);
-		Inst.WaitUntilReady();
+		CHECK(Inst.WaitUntilReady(2000));
 
 		CachePolicy				   Policy = CachePolicy::Default;
 		std::vector<zen::CacheKey> Keys	  = PutCacheRecords(BaseUri, "ue4.ddc"sv, "mastodon"sv, 128);
@@ -1491,7 +1491,7 @@ TEST_CASE("zcache.rpc")
 		ZenServerInstance Inst(TestEnv);
 		Inst.SetTestDir(TestDir);
 		Inst.SpawnServer(PortNumber);
-		Inst.WaitUntilReady();
+		CHECK(Inst.WaitUntilReady(2000));
 
 		CachePolicy				   Policy		= CachePolicy::Default;
 		std::vector<zen::CacheKey> ExistingKeys = PutCacheRecords(BaseUri, "ue4.ddc"sv, "mastodon"sv, 128);
@@ -1591,7 +1591,7 @@ TEST_CASE("zcache.rpc")
 		ZenServerInstance Inst(TestEnv);
 		Inst.SetTestDir(TestDir);
 		Inst.SpawnServer(PortNumber);
-		Inst.WaitUntilReady();
+		CHECK(Inst.WaitUntilReady(2000));
 
 		std::vector<zen::CacheKey> SmallKeys = PutCacheRecords(BaseUri, "ue4.ddc"sv, "mastodon"sv, 4, 1024);
 		std::vector<zen::CacheKey> LargeKeys = PutCacheRecords(BaseUri, "ue4.ddc"sv, "mastodon"sv, 4, 1024 * 1024 * 16, SmallKeys.size());
@@ -2536,7 +2536,7 @@ public:
 		{
 			auto& Instance = m_Instances[i];
 
-			Instance->WaitUntilReady();
+			CHECK(Instance->WaitUntilReady(2000));
 		}
 	}
 
@@ -2679,7 +2679,7 @@ TEST_CASE("websocket.basic")
 	ZenServerInstance Inst(TestEnv);
 	Inst.SetTestDir(TestDir);
 	Inst.SpawnServer(PortNumber, "--websocket-port=8848"sv);
-	Inst.WaitUntilReady();
+	CHECK(Inst.WaitUntilReady(2000));
 
 	asio::io_context IoCtx;
 	IoDispatcher	 IoDispatcher(IoCtx);
@@ -3266,14 +3266,14 @@ TEST_CASE("lifetime.owner")
 	std::filesystem::path TestDir1 = TestEnv.CreateNewTestDir();
 	Zen1.SetTestDir(TestDir1);
 	Zen1.SpawnServer(PortNumber);
-	Zen1.WaitUntilReady();
+	CHECK(Zen1.WaitUntilReady(2000));
 	Zen1.Detach();
 
 	ZenServerInstance	  Zen2(TestEnv);
 	std::filesystem::path TestDir2 = TestEnv.CreateNewTestDir();
 	Zen2.SetTestDir(TestDir2);
 	Zen2.SpawnServer(PortNumber);
-	Zen2.WaitUntilReady();
+	CHECK(Zen2.WaitUntilReady(2000));
 	Zen2.Detach();
 }
 
@@ -3292,7 +3292,7 @@ TEST_CASE("lifetime.owner.2")
 	ZenServerInstance Zen1(TestEnv);
 	Zen1.SetTestDir(TestDir1);
 	Zen1.SpawnServer(PortNumber);
-	Zen1.WaitUntilReady();
+	CHECK(Zen1.WaitUntilReady(2000));
 
 	ZenServerInstance Zen2(TestEnv);
 	Zen2.SetTestDir(TestDir2);