fix hub.consul.provision.registration testde/hub-instance-state-refactor

1 files changed, 31 insertions, 9 deletions

diff --git a/src/zenserver-test/hub-tests.cpp b/src/zenserver-test/hub-tests.cpp
index c3aaa85d5..303357339 100644
--- a/src/zenserver-test/hub-tests.cpp
+++ b/src/zenserver-test/hub-tests.cpp
@@ -568,13 +568,12 @@ TEST_CASE("hub.consul.provision.registration")
 			CHECK_EQ(HubService["Port"sv].AsDouble(0), double(PortNumber));
 		}
 
-		// Verify health check endpoint URLs
+		// Verify hub health check endpoint URL (registered from startup with an active interval)
 		{
 			std::string		ChecksJsonError;
 			CbFieldIterator ChecksRoot = LoadCompactBinaryFromJson(Client.GetAgentChecksJson(), ChecksJsonError);
 			REQUIRE(ChecksJsonError.empty());
 
-			CbObjectView ModCheck;
 			CbObjectView HubCheck;
 			for (CbFieldView F : ChecksRoot)
 			{
@@ -585,18 +584,12 @@ TEST_CASE("hub.consul.provision.registration")
 				for (CbFieldView C : F.AsObjectView())
 				{
 					CbObjectView Check = C.AsObjectView();
-					if (Check["ServiceID"sv].AsString() == "testmod"sv)
-					{
-						ModCheck = Check;
-					}
-					else if (Check["ServiceID"sv].AsString() == "zen-hub-test-instance"sv)
+					if (Check["ServiceID"sv].AsString() == "zen-hub-test-instance"sv)
 					{
 						HubCheck = Check;
 					}
 				}
 			}
-			REQUIRE(ModCheck);
-			CHECK(ModCheck["HTTP"sv].AsString().find("/health") != std::string_view::npos);
 			REQUIRE(HubCheck);
 			CHECK(HubCheck["HTTP"sv].AsString().find("/hub/health") != std::string_view::npos);
 		}
@@ -604,6 +597,35 @@ TEST_CASE("hub.consul.provision.registration")
 
 	// Wait for Provisioned before touching the module's HTTP endpoint.
 	REQUIRE(WaitForModuleState(HubClient, "testmod", "provisioned"));
+
+	// Verify module health check endpoint URL. No health check is registered during Provisioning
+	// (to avoid Consul marking the service critical before the child process is ready); it is added
+	// on transition to Provisioned.
+	{
+		std::string		ChecksJsonError;
+		CbFieldIterator ChecksRoot = LoadCompactBinaryFromJson(Client.GetAgentChecksJson(), ChecksJsonError);
+		REQUIRE(ChecksJsonError.empty());
+
+		CbObjectView ModCheck;
+		for (CbFieldView F : ChecksRoot)
+		{
+			if (!F.IsObject())
+			{
+				continue;
+			}
+			for (CbFieldView C : F.AsObjectView())
+			{
+				CbObjectView Check = C.AsObjectView();
+				if (Check["ServiceID"sv].AsString() == "testmod"sv)
+				{
+					ModCheck = Check;
+				}
+			}
+		}
+		REQUIRE(ModCheck);
+		CHECK(ModCheck["HTTP"sv].AsString().find("/health") != std::string_view::npos);
+	}
+
 	{
 		HttpClient ModClient(fmt::format("http://localhost:{}", ModulePort), kFastTimeout);
 		CHECK(ModClient.Get("/health/"));