test: introduce snapshot_type fixture

We have a few tests that are parametrized to run with both full and diff
snapshots enabled, so let's move this into a fixture.

Signed-off-by: Patrick Roy <[email protected]>

Author: roypat

tests/conftest.py

@@ -34,7 +34,7 @@
 from framework import defs, utils
 from framework.artifacts import disks, kernel_params
 from framework.defs import DEFAULT_BINARY_DIR
-from framework.microvm import MicroVMFactory
+from framework.microvm import MicroVMFactory, SnapshotType
 from framework.properties import global_props
 from framework.utils_cpu_templates import (
     custom_cpu_templates_params,
@@ -411,6 +411,12 @@ def io_engine(request):
     return request.param
 
 
+@pytest.fixture(params=[SnapshotType.DIFF, SnapshotType.FULL])
+def snapshot_type(request):
+    """All possible snapshot types"""
+    return request.param
+
+
 @pytest.fixture
 def results_dir(request, pytestconfig):
     """

tests/integration_tests/functional/test_snapshot_basic.py

@@ -111,7 +111,6 @@ def test_snapshot_current_version(uvm_nano):
 # - Rootfs: Ubuntu 18.04
 # - Microvm: 2vCPU with 512 MB RAM
 # TODO: Multiple microvm sizes must be tested in the async pipeline.
-@pytest.mark.parametrize("snapshot_type", [SnapshotType.DIFF, SnapshotType.FULL])
 @pytest.mark.parametrize("use_snapshot_editor", [False, True])
 def test_cycled_snapshot_restore(
     bin_vsock_path,
@@ -500,7 +499,6 @@ def test_snapshot_overwrite_self(guest_kernel, rootfs, microvm_factory):
     # restored, with a new snapshot of this vm, does not break the VM
 
 
-@pytest.mark.parametrize("snapshot_type", [SnapshotType.DIFF, SnapshotType.FULL])
 def test_vmgenid(guest_kernel_linux_6_1, rootfs, microvm_factory, snapshot_type):
     """
     Test VMGenID device upon snapshot resume