Skip to content

test: display the cpu template name #5230

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 29, 2025
Merged

test: display the cpu template name #5230

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f93eab8
test: display the cpu template name
emmanuel-ferdman May 28, 2025
ceb18f6
Merge branch 'main' into main
roypat May 29, 2025
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
8 changes: 4 additions & 4 deletions tests/integration_tests/functional/test_cpu_features_x86_64.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ def test_cpu_cpuid_snapshot(microvm_factory, guest_kernel, rootfs, cpu_template_
"""
cpu_template_name = get_cpu_template_name(cpu_template_any)
if cpu_template_name not in MSR_SUPPORTED_TEMPLATES:
pytest.skip("This test does not support {cpu_template_name} template.")
pytest.skip(f"This test does not support {cpu_template_name} template.")

shared_names = SNAPSHOT_RESTORE_SHARED_NAMES

Expand Down Expand Up @@ -611,7 +611,7 @@ def test_cpu_cpuid_restore(microvm_factory, guest_kernel, cpu_template_any):
"""
cpu_template_name = get_cpu_template_name(cpu_template_any)
if cpu_template_name not in MSR_SUPPORTED_TEMPLATES:
pytest.skip("This test does not support {cpu_template_name} template.")
pytest.skip(f"This test does not support {cpu_template_name} template.")

shared_names = SNAPSHOT_RESTORE_SHARED_NAMES
snapshot_artifacts_dir = (
Expand Down Expand Up @@ -646,8 +646,8 @@ def test_cpu_template(uvm_plain_any, cpu_template_any, microvm_factory):
supported CPU templates.
"""
cpu_template_name = get_cpu_template_name(cpu_template_any)
if cpu_template_name not in ["T2", "T2S", "SPR_TO_T2_5.10", "SPR_TO_T2_6.1" "C3"]:
pytest.skip("This test does not support {cpu_template_name} template.")
if cpu_template_name not in ["T2", "T2S", "SPR_TO_T2_5.10", "SPR_TO_T2_6.1", "C3"]:
pytest.skip(f"This test does not support {cpu_template_name} template.")

test_microvm = uvm_plain_any
test_microvm.spawn()
Expand Down