From 27bdd0c82da8cbf6f8d99ffe3690a2bcd5a28099 Mon Sep 17 00:00:00 2001
From: Emma Qiao <qqiao@nvidia.com>
Date: Fri, 16 May 2025 17:56:40 +0800
Subject: [PATCH] [TRTLLM-4886][infra]Try another timeout opt to exit test
 thread directly instead of gracefully (#4341)

* Try another timeout opt to kill test thread

Signed-off-by: qqiao <qqiao@nvidia.com>

* Return true when try to delete non-existing result file

Signed-off-by: qqiao <qqiao@nvidia.com>

* quick test for the result file

Signed-off-by: qqiao <qqiao@nvidia.com>

* Change back the global timeout setting

Signed-off-by: qqiao <qqiao@nvidia.com>

* Try to kill test in internal pytest

Signed-off-by: qqiao <qqiao@nvidia.com>

---------

Signed-off-by: qqiao <qqiao@nvidia.com>
---
 jenkins/L0_Test.groovy                   | 3 ++-
 tests/integration/defs/test_unittests.py | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jenkins/L0_Test.groovy b/jenkins/L0_Test.groovy
index 8fc738e598..2258bd822f 100644
--- a/jenkins/L0_Test.groovy
+++ b/jenkins/L0_Test.groovy
@@ -1013,6 +1013,7 @@ def runLLMTestlistOnPlatformImpl(pipeline, platform, testList, config=VANILLA_CO
             extraInternalEnv,
             "pytest",
             "-v",
+            "--timeout-method=thread",
             "--apply-test-list-correction",
             "--splitting-algorithm least_duration",
             "--timeout=${pytestTestTimeout}",
@@ -1122,7 +1123,7 @@ def runLLMTestlistOnPlatform(pipeline, platform, testList, config=VANILLA_CONFIG
         sh """
             ls -all ${stageName}/
             if ! grep -q '<testcase' ${stageName}/results.xml; then
-                rm ${stageName}/results.xml
+                rm ${stageName}/results.xml || true
             fi
         """
         def llmPath = sh (script: "realpath .", returnStdout: true).trim()
diff --git a/tests/integration/defs/test_unittests.py b/tests/integration/defs/test_unittests.py
index b38a8a9fa3..8f8cd2f987 100644
--- a/tests/integration/defs/test_unittests.py
+++ b/tests/integration/defs/test_unittests.py
@@ -122,6 +122,7 @@ def test_unittests_v2(llm_root, llm_venv, case: str, output_dir):
         ignore_opt,
         "-v",
         "--timeout=1600",
+        "--timeout-method=thread",
     ]
 
     if dry_run: