Skip to content

Commit

Permalink
fix(test): remove timeouts from MSR integration tests
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
roypat committed Dec 13, 2024
1 parent 8c7ee82 commit 37f28a3
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions tests/integration_tests/functional/test_cpu_features_x86_64.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ def test_cpu_rdmsr(
)
vm.start()
vm.ssh.scp_put(DATA_FILES / "msr_reader.sh", "/tmp/msr_reader.sh")
_, stdout, stderr = vm.ssh.run("/tmp/msr_reader.sh")
_, stdout, stderr = vm.ssh.run("/tmp/msr_reader.sh", timeout=None)
assert stderr == ""

# Load results read from the microvm
Expand Down Expand Up @@ -362,7 +362,9 @@ def dump_msr_state_to_file(dump_fname, ssh_conn, shared_names):
ssh_conn.scp_put(
shared_names["msr_reader_host_fname"], shared_names["msr_reader_guest_fname"]
)
_, stdout, stderr = ssh_conn.run(shared_names["msr_reader_guest_fname"])
_, stdout, stderr = ssh_conn.run(
shared_names["msr_reader_guest_fname"], timeout=None
)
assert stderr == ""

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

_, _, stderr = vm.ssh.run(f"{msr_writer_guest_fname} {wrmsr_input_guest_fname}")
_, _, stderr = vm.ssh.run(
f"{msr_writer_guest_fname} {wrmsr_input_guest_fname}", timeout=None
)
assert stderr == ""

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

0 comments on commit 37f28a3

Please sign in to comment.