test: Include a timeout marker to all Cancellation / Migration E2E tests (#4764)

Signed-off-by: Jacky <[email protected]>

Author: kthui

tests/fault_tolerance/cancellation/test_sglang.py

@@ -21,6 +21,13 @@
 
 logger = logging.getLogger(__name__)
 
+pytestmark = [
+    pytest.mark.sglang,
+    pytest.mark.e2e,
+    pytest.mark.model(FAULT_TOLERANCE_MODEL_NAME),
+    pytest.mark.nightly,
+]
+
 
 class DynamoWorkerProcess(ManagedProcess):
     """Process manager for Dynamo worker with SGLang backend"""
@@ -146,11 +153,8 @@ def is_ready(self, response) -> bool:
         return False
 
 
-@pytest.mark.e2e
-@pytest.mark.sglang
+@pytest.mark.timeout(160)  # 3x average
 @pytest.mark.gpu_1
-@pytest.mark.model(FAULT_TOLERANCE_MODEL_NAME)
-@pytest.mark.nightly
 @pytest.mark.xfail(strict=False)
 def test_request_cancellation_sglang_aggregated(
     request, runtime_services, predownload_models
@@ -236,11 +240,8 @@ def test_request_cancellation_sglang_aggregated(
                 logger.info(f"{description} detected successfully")
 
 
-@pytest.mark.e2e
-@pytest.mark.sglang
+@pytest.mark.timeout(185)  # 3x average
 @pytest.mark.gpu_2
-@pytest.mark.model(FAULT_TOLERANCE_MODEL_NAME)
-@pytest.mark.nightly
 def test_request_cancellation_sglang_decode_cancel(
     request, runtime_services, predownload_models
 ):

tests/fault_tolerance/cancellation/test_trtllm.py

@@ -26,6 +26,7 @@
     pytest.mark.gpu_1,
     pytest.mark.e2e,
     pytest.mark.model(FAULT_TOLERANCE_MODEL_NAME),
+    pytest.mark.nightly,
 ]
 
 
@@ -134,7 +135,7 @@ def is_ready(self, response) -> bool:
         return False
 
 
-@pytest.mark.nightly
+@pytest.mark.timeout(140)  # 3x average
 def test_request_cancellation_trtllm_aggregated(
     request, runtime_services, predownload_models
 ):
@@ -208,7 +209,7 @@ def test_request_cancellation_trtllm_aggregated(
                 logger.info(f"{description} detected successfully")
 
 
-@pytest.mark.nightly
+@pytest.mark.timeout(350)  # 3x average
 def test_request_cancellation_trtllm_decode_cancel(
     request, runtime_services, predownload_models
 ):
@@ -281,7 +282,7 @@ def test_request_cancellation_trtllm_decode_cancel(
                 )
 
 
-@pytest.mark.nightly
+@pytest.mark.timeout(350)  # 3x average
 def test_request_cancellation_trtllm_prefill_cancel(
     request, runtime_services, predownload_models
 ):
@@ -364,6 +365,7 @@ def test_request_cancellation_trtllm_prefill_cancel(
                 )
 
 
+@pytest.mark.timeout(350)  # 3x average
 @pytest.mark.xfail(
     reason="May fail due to unknown reason with TRT-LLM or backend implementation",
     strict=False,

tests/fault_tolerance/cancellation/test_vllm.py

@@ -20,6 +20,14 @@
 
 logger = logging.getLogger(__name__)
 
+pytestmark = [
+    pytest.mark.vllm,
+    pytest.mark.gpu_1,
+    pytest.mark.e2e,
+    pytest.mark.model(FAULT_TOLERANCE_MODEL_NAME),
+    pytest.mark.nightly,
+]
+
 
 class DynamoWorkerProcess(ManagedProcess):
     """Process manager for Dynamo worker with vLLM backend"""
@@ -120,11 +128,7 @@ def is_ready(self, response) -> bool:
         return False
 
 
-@pytest.mark.vllm
-@pytest.mark.gpu_1
-@pytest.mark.e2e
-@pytest.mark.model(FAULT_TOLERANCE_MODEL_NAME)
-@pytest.mark.nightly
+@pytest.mark.timeout(110)  # 3x average
 def test_request_cancellation_vllm_aggregated(
     request, runtime_services, predownload_models
 ):
@@ -198,11 +202,7 @@ def test_request_cancellation_vllm_aggregated(
                 logger.info(f"{description} detected successfully")
 
 
-@pytest.mark.vllm
-@pytest.mark.gpu_1
-@pytest.mark.e2e
-@pytest.mark.model(FAULT_TOLERANCE_MODEL_NAME)
-@pytest.mark.nightly
+@pytest.mark.timeout(150)  # 3x average
 def test_request_cancellation_vllm_decode_cancel(
     request, runtime_services, predownload_models, set_ucx_tls_no_mm
 ):
@@ -272,11 +272,7 @@ def test_request_cancellation_vllm_decode_cancel(
                 )
 
 
-@pytest.mark.vllm
-@pytest.mark.gpu_1
-@pytest.mark.e2e
-@pytest.mark.model(FAULT_TOLERANCE_MODEL_NAME)
-@pytest.mark.nightly
+@pytest.mark.timeout(150)  # 3x average
 def test_request_cancellation_vllm_prefill_cancel(
     request, runtime_services, predownload_models, set_ucx_tls_no_mm
 ):

tests/fault_tolerance/migration/test_sglang.py

@@ -108,6 +108,11 @@ def is_ready(self, response) -> bool:
         return False
 
 
+@pytest.mark.timeout(235)  # 3x average
+@pytest.mark.xfail(
+    reason="For some reason both replicas received the request where only one should",
+    strict=False,
+)
 def test_request_migration_sglang_worker_failure(
     request, runtime_services, predownload_models, set_ucx_tls_no_mm
 ):
@@ -199,6 +204,11 @@ def test_request_migration_sglang_graceful_shutdown(
                 verify_migration_occurred(frontend)
 
 
+@pytest.mark.timeout(135)  # 3x average
+@pytest.mark.xfail(
+    reason="For some reason both replicas received the request where only one should",
+    strict=False,
+)
 def test_no_request_migration_sglang_worker_failure(
     request, runtime_services, predownload_models, set_ucx_tls_no_mm
 ):

tests/fault_tolerance/migration/test_trtllm.py

@@ -104,6 +104,11 @@ def is_ready(self, response) -> bool:
         return False
 
 
+@pytest.mark.timeout(290)  # 3x average
+@pytest.mark.xfail(
+    reason="For some reason both replicas received the request where only one should",
+    strict=False,
+)
 def test_request_migration_trtllm_worker_failure(
     request, runtime_services, predownload_models, set_ucx_tls_no_mm
 ):
@@ -195,6 +200,11 @@ def test_request_migration_trtllm_graceful_shutdown(
                 verify_migration_occurred(frontend)
 
 
+@pytest.mark.timeout(185)  # 3x average
+@pytest.mark.xfail(
+    reason="For some reason both replicas received the request where only one should",
+    strict=False,
+)
 def test_no_request_migration_trtllm_worker_failure(
     request, runtime_services, predownload_models, set_ucx_tls_no_mm
 ):

tests/fault_tolerance/migration/test_vllm.py

@@ -108,6 +108,7 @@ def is_ready(self, response) -> bool:
         return False
 
 
+@pytest.mark.timeout(290)  # 3x average
 def test_request_migration_vllm_worker_failure(
     request, runtime_services, predownload_models, set_ucx_tls_no_mm
 ):
@@ -151,6 +152,7 @@ def test_request_migration_vllm_worker_failure(
                 verify_migration_occurred(frontend)
 
 
+@pytest.mark.timeout(280)  # 3x average
 def test_request_migration_vllm_graceful_shutdown(
     request, runtime_services, predownload_models, set_ucx_tls_no_mm
 ):
@@ -198,6 +200,7 @@ def test_request_migration_vllm_graceful_shutdown(
                 verify_migration_occurred(frontend)
 
 
+@pytest.mark.timeout(150)  # 3x average
 def test_no_request_migration_vllm_worker_failure(
     request, runtime_services, predownload_models, set_ucx_tls_no_mm
 ):
@@ -257,6 +260,7 @@ def test_no_request_migration_vllm_worker_failure(
                     ), f"Unexpected migration message: {e}"
 
 
+@pytest.mark.timeout(140)  # 3x average
 def test_no_request_migration_vllm_graceful_shutdown(
     request, runtime_services, predownload_models, set_ucx_tls_no_mm
 ):