Skip to content

Commit 0b4266b

Browse files
committed
fix(test): remove timeouts from MSR integration tests
These run in a nightly pipeline and apparently the read/write MSR scripts take longer than the 100s default timeout added in b99abe1. Fixes: 36448e9 ("test: set default timeout of 100s for ssh commands") Signed-off-by: Patrick Roy <[email protected]>
1 parent 8c7ee82 commit 0b4266b

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

tests/integration_tests/functional/test_cpu_features_x86_64.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ def test_cpu_rdmsr(
314314
)
315315
vm.start()
316316
vm.ssh.scp_put(DATA_FILES / "msr_reader.sh", "/tmp/msr_reader.sh")
317-
_, stdout, stderr = vm.ssh.run("/tmp/msr_reader.sh")
317+
_, stdout, stderr = vm.ssh.run("/tmp/msr_reader.sh", timeout=None)
318318
assert stderr == ""
319319

320320
# Load results read from the microvm
@@ -362,7 +362,9 @@ def dump_msr_state_to_file(dump_fname, ssh_conn, shared_names):
362362
ssh_conn.scp_put(
363363
shared_names["msr_reader_host_fname"], shared_names["msr_reader_guest_fname"]
364364
)
365-
_, stdout, stderr = ssh_conn.run(shared_names["msr_reader_guest_fname"])
365+
_, stdout, stderr = ssh_conn.run(
366+
shared_names["msr_reader_guest_fname"], timeout=None
367+
)
366368
assert stderr == ""
367369

368370
with open(dump_fname, "w", encoding="UTF-8") as file:
@@ -416,7 +418,9 @@ def test_cpu_wrmsr_snapshot(microvm_factory, guest_kernel, rootfs, msr_cpu_templ
416418
wrmsr_input_guest_fname = "/tmp/wrmsr_input.txt"
417419
vm.ssh.scp_put(wrmsr_input_host_fname, wrmsr_input_guest_fname)
418420

419-
_, _, stderr = vm.ssh.run(f"{msr_writer_guest_fname} {wrmsr_input_guest_fname}")
421+
_, _, stderr = vm.ssh.run(
422+
f"{msr_writer_guest_fname} {wrmsr_input_guest_fname}", timeout=None
423+
)
420424
assert stderr == ""
421425

422426
# Dump MSR state to a file that will be published to S3 for the 2nd part of the test

0 commit comments

Comments
 (0)