Skip to content

Commit e7d4754

Browse files
authored
Update to the list of suites executed as part of LTP Lite Test Case (#3692)
1 parent 7bfc11b commit e7d4754

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

microsoft/testsuites/ltp/ltp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ class Ltp(Tool):
5959
LTP_OUTPUT_PATH = "/opt/ltp/ltp-output.log"
6060
LTP_SKIP_FILE = "/opt/ltp/skipfile"
6161
COMPILE_TIMEOUT = 1800
62-
RUN_TIMEOUT = 12000
6362

6463
@property
6564
def command(self) -> str:
@@ -87,6 +86,7 @@ def run_test(
8786
log_path: str,
8887
block_device: Optional[str] = None,
8988
temp_dir: str = "/tmp/",
89+
ltp_run_timeout: int = 12000,
9090
) -> List[LtpResult]:
9191
# tests cannot be empty
9292
assert_that(ltp_tests, "ltp_tests cannot be empty").is_not_empty()
@@ -144,7 +144,7 @@ def run_test(
144144
)
145145

146146
pgrep = self.node.tools[Pgrep]
147-
pgrep.wait_processes("runltp", timeout=self.RUN_TIMEOUT)
147+
pgrep.wait_processes("runltp", timeout=ltp_run_timeout)
148148

149149
# to avoid no permission issue when copying back files
150150
self.node.tools[Chmod].update_folder("/opt", "a+rwX", sudo=True)

microsoft/testsuites/ltp/ltpsuite.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
)
3030
class LtpTestsuite(TestSuite):
3131
_TIME_OUT = 18000
32-
LTP_LITE_TESTS = ["math", "fsx", "ipc", "mm", "sched", "pty", "fs"]
32+
LTP_LITE_TESTS = ["math", "ipc", "mm", "sched", "pty", "fs"]
3333
LTP_REQUIRED_DISK_SIZE_IN_GB = 2
3434

3535
@TestCaseMetadata(
@@ -66,7 +66,7 @@ def verify_ltp_lite(
6666
tests = variables.get("ltp_test", "")
6767
skip_tests = variables.get("ltp_skip_test", "")
6868
ltp_tests_git_tag = variables.get("ltp_tests_git_tag", "")
69-
69+
ltp_run_timeout = variables.get("ltp_run_timeout", 12000)
7070
# block device is required for few ltp tests
7171
# If not provided, we will find a disk with enough space
7272
block_device = variables.get("ltp_block_device", None)
@@ -102,6 +102,7 @@ def verify_ltp_lite(
102102
skip_test_list,
103103
log_path,
104104
block_device=block_device,
105+
ltp_run_timeout=ltp_run_timeout,
105106
)
106107

107108
def after_case(self, log: Logger, **kwargs: Any) -> None:

0 commit comments

Comments
 (0)