Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(test): remove timeouts from MSR integration tests #4958

Merged
merged 2 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitlint
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ line-length=72

[ignore-body-lines]
# Ignore HTTP reference links
# Ignore lines that start with 'Co-Authored-By' or with 'Signed-off-by'
regex=(^\[.+\]: http.+)|(^Co-Authored-By)|(^Signed-off-by)
# Ignore lines that start with 'Co-Authored-By', with 'Signed-off-by' or with 'Fixes'
regex=(^\[.+\]: http.+)|(^Co-Authored-By)|(^Signed-off-by)|(^Fixes:)

[ignore-by-author-name]
# Ignore certain rules for commits of which the author name matches a regex
Expand Down
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
Loading