From 2a9de1b1d40efe58a602cc2a903cd4135faaeb34 Mon Sep 17 00:00:00 2001
From: tensorrt-cicd <90828364+tensorrt-cicd@users.noreply.github.com>
Date: Mon, 25 May 2026 03:46:52 -0700
Subject: [PATCH] [nvbugs/6190759][fix] skip multi-node disagg test cleanly on
 single-node and unwaive

The disagg_server fixture calls get_the_other_host(0), which asserts
len(NODE_LIST) >= 2. On single-node CI runners (empty SLURM_NODELIST),
this fires during fixture setup before test_completion's pytest.skip
can run, so the test errors instead of skipping.

Promote the multi-node guard to a module-level pytest.mark.skipif so
the skip happens during collection, before any fixture runs. Drop the
now-redundant in-test skip block. Remove the stale waive entry that
the prior UCX_TLS fix (90694fec72) missed.

Signed-off-by: tensorrt-cicd <90828364+tensorrt-cicd@users.noreply.github.com>
---
 .../llmapi/apps/_test_disagg_serving_multi_nodes.py      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/unittest/llmapi/apps/_test_disagg_serving_multi_nodes.py b/tests/unittest/llmapi/apps/_test_disagg_serving_multi_nodes.py
index 20f7ef29eea6..0b8d7a1eab93 100644
--- a/tests/unittest/llmapi/apps/_test_disagg_serving_multi_nodes.py
+++ b/tests/unittest/llmapi/apps/_test_disagg_serving_multi_nodes.py
@@ -22,7 +22,11 @@
 NODE_LIST = expand_slurm_nodelist(os.environ.get("SLURM_NODELIST", ""))
 SLURM_NTASKS_PER_NODE = int(os.environ.get("SLURM_NTASKS_PER_NODE", 1))
 
-pytestmark = pytest.mark.threadleak(enabled=False)
+pytestmark = [
+    pytest.mark.threadleak(enabled=False),
+    pytest.mark.skipif(len(NODE_LIST) != 2,
+                       reason="This test is only expected to run with 2 nodes"),
+]
 
 # This test assumes that there are >2 nodes, we run ctx/disagg-server/client on the first node,
 # and run gen the second node.
@@ -186,9 +190,6 @@ def client(disagg_server: RemoteDisaggOpenAIServer):
 
 def test_completion(client: openai.OpenAI,
                     disagg_server: RemoteDisaggOpenAIServer, model_name: str):
-    if len(NODE_LIST) != 2:
-        pytest.skip("This test is only expected to run with 2 nodes")
-        return
     if is_pytest_node():
         print(f"running test_completion on rank {RANK} node rank {NODE_RANK}")
         prompt = "What is the result of 1+1? Answer in one word: "