From 326ba8c8a44d555560f7e103799e4af3c2651078 Mon Sep 17 00:00:00 2001 From: Joshua Valluru <326636767+joshua-berri@users.noreply.github.com> Date: Thu, 17 Sep 2026 10:03:36 -0700 Subject: [PATCH] test(mcp): reuse the registered server snapshot for alias grants --- tests/e2e/mcp/mcp_client.py | 13 +++++++------ tests/e2e/mcp/test_mcp_key_access_e2e.py | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/e2e/mcp/mcp_client.py b/tests/e2e/mcp/mcp_client.py index 58dcdafc901..45414df709f 100644 --- a/tests/e2e/mcp/mcp_client.py +++ b/tests/e2e/mcp/mcp_client.py @@ -217,8 +217,8 @@ class McpClient: response_type=McpHealthResponse, ) - def await_registered(self, server_id: str) -> None: - """Poll /v1/mcp/server until `server_id` is listed. Fails at poll_timeout. + def await_registered(self, server_id: str) -> McpServerRow: + """Poll /v1/mcp/server and return the matching row. Fails at poll_timeout. The DB row exists the moment registration returns, but a data-plane pod answers the listing from a registry it refreshes on a periodic DB sync, so a @@ -227,14 +227,15 @@ class McpClient: """ deadline = time.monotonic() + self.proxy.poll_timeout while True: - registered = frozenset(row.server_id for row in self.registered_servers()) - if server_id in registered: - return + registered = self.registered_servers() + server = next((row for row in registered if row.server_id == server_id), None) + if server is not None: + return server if time.monotonic() >= deadline: raise AssertionError( f"registered server {server_id} still absent from /v1/mcp/server " f"{self.proxy.poll_timeout}s after registration (the data plane never synced " - f"the row): {registered}" + f"the row): {frozenset(row.server_id for row in registered)}" ) time.sleep(self.proxy.poll_interval) diff --git a/tests/e2e/mcp/test_mcp_key_access_e2e.py b/tests/e2e/mcp/test_mcp_key_access_e2e.py index 9952f333aae..c00d67bc9cf 100644 --- a/tests/e2e/mcp/test_mcp_key_access_e2e.py +++ b/tests/e2e/mcp/test_mcp_key_access_e2e.py @@ -44,8 +44,8 @@ class TestMcpKeyGrantByAlias: grants access on every region. The same key must still see the server's tools, proving the alias grant is honored at request time.""" server_id = register_datadog_mcp(client, resources) - client.await_registered(server_id) - alias = next(row.alias for row in client.registered_servers() if row.server_id == server_id) + registered = client.await_registered(server_id) + alias = registered.alias assert alias, f"registered server {server_id} has no alias to grant by" key = _key(client, resources, mcp_servers=[alias])