Skip to content

Commit d4c26a9

Browse files
pb8ozulinx86
authored andcommitted
test: avoid skipped tests in test_snapshot_perf.py
We cannot just use the guest_kernel_4_14 fixture as st_core already depends on guest_kernel. Use indirect parametrization for the guest fixture as a workaround. Signed-off-by: Pablo Barbáchano <[email protected]>
1 parent dd59296 commit d4c26a9

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

tests/integration_tests/performance/test_snapshot_perf.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import pytest
1010

1111
import host_tools.logging as log_tools
12+
from framework.artifacts import kernel_params
1213
from framework.properties import global_props
1314
from framework.stats import consumer, producer, types
1415
from framework.utils import CpuMap
@@ -26,6 +27,12 @@
2627
{},
2728
)
2829

30+
# The guest kernel does not "participate" in snapshot restore, so just pick
31+
# some arbitrary one
32+
only_one_guest_kernel = pytest.mark.parametrize(
33+
"guest_kernel", list(kernel_params("vmlinux-4.14*")), indirect=True
34+
)
35+
2936

3037
def snapshot_create_producer(vm, target_version, metrics_fifo):
3138
"""Produce results for snapshot create tests."""
@@ -65,6 +72,7 @@ def snapshot_resume_producer(microvm_factory, snapshot, metrics_fifo):
6572
return value
6673

6774

75+
@only_one_guest_kernel
6876
def test_older_snapshot_resume_latency(
6977
microvm_factory,
7078
guest_kernel,
@@ -80,11 +88,6 @@ def test_older_snapshot_resume_latency(
8088
restore in current version.
8189
"""
8290

83-
# The guest kernel does not "participate" in snapshot restore, so just pick
84-
# some arbitrary one
85-
if "4.14" not in guest_kernel.name:
86-
pytest.skip("just test one guest kernel")
87-
8891
# due to bug fixed in commit 8dab78b
8992
firecracker_version = firecracker_release.version_tuple
9093
if global_props.instance == "m6a.metal" and firecracker_version < (1, 3, 3):
@@ -138,6 +141,7 @@ def test_older_snapshot_resume_latency(
138141
st_core.run_exercise()
139142

140143

144+
@only_one_guest_kernel
141145
def test_snapshot_create_latency(
142146
microvm_factory,
143147
guest_kernel,
@@ -146,11 +150,6 @@ def test_snapshot_create_latency(
146150
):
147151
"""Measure the latency of creating a Full snapshot"""
148152

149-
# The guest kernel does not "participate" in snapshot restore, so just pick
150-
# some arbitrary one
151-
if "4.14" not in guest_kernel.name:
152-
pytest.skip("just test one guest kernel")
153-
154153
guest_mem_mib = 512
155154
vcpus = 2
156155
microvm_cfg = f"{vcpus}vcpu_{guest_mem_mib}mb.json"

0 commit comments

Comments
 (0)