From 2df07662b49f5d27ff412e82c587f32c7c1575f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Barb=C3=A1chano?= <pablob@amazon.com>
Date: Thu, 28 Nov 2024 23:25:56 +0100
Subject: [PATCH] tests: simplify rootfs fixture
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since we only have one rootfs, simplify the fixture to return a single
value. This will have also not show it as part of the test instance
name.

Signed-off-by: Pablo Barbáchano <pablob@amazon.com>
---
 tests/conftest.py            | 23 ++++++++++++-----------
 tests/framework/artifacts.py | 10 ++--------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index b599ffc79ab..5ed61083014 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -35,7 +35,7 @@
 
 import host_tools.cargo_build as build_tools
 from framework import defs, utils
-from framework.artifacts import kernel_params, rootfs_params
+from framework.artifacts import disks, kernel_params
 from framework.microvm import MicroVMFactory
 from framework.properties import global_props
 from framework.utils_cpu_templates import (
@@ -354,13 +354,6 @@ def guest_kernel_fxt(request, record_property):
     return kernel
 
 
-def rootfs_fxt(request, record_property):
-    """Return all supported rootfs."""
-    fs = request.param
-    record_property("rootfs", fs.name)
-    return fs
-
-
 # Fixtures for all guest kernels, and specific versions
 guest_kernel = pytest.fixture(guest_kernel_fxt, params=kernel_params("vmlinux-*"))
 guest_kernel_acpi = pytest.fixture(
@@ -380,9 +373,17 @@ def rootfs_fxt(request, record_property):
     params=kernel_params("vmlinux-6.1*"),
 )
 
-# Fixtures for all Ubuntu rootfs, and specific versions
-rootfs = pytest.fixture(rootfs_fxt, params=rootfs_params("ubuntu-24*.squashfs"))
-rootfs_rw = pytest.fixture(rootfs_fxt, params=rootfs_params("*.ext4"))
+
+@pytest.fixture
+def rootfs():
+    """Return an Ubuntu 24.04 read-only rootfs"""
+    return disks("ubuntu-24.04.squashfs")[0]
+
+
+@pytest.fixture
+def rootfs_rw():
+    """Return an Ubuntu 24.04 ext4 rootfs"""
+    return disks("ubuntu-24.04.ext4")[0]
 
 
 @pytest.fixture
diff --git a/tests/framework/artifacts.py b/tests/framework/artifacts.py
index 77584f02129..0ed27c16b61 100644
--- a/tests/framework/artifacts.py
+++ b/tests/framework/artifacts.py
@@ -44,9 +44,9 @@ def kernels(glob, artifact_dir: Path = ARTIFACT_DIR) -> Iterator:
                 break
 
 
-def disks(glob) -> Iterator:
+def disks(glob) -> list:
     """Return supported rootfs"""
-    yield from sorted(ARTIFACT_DIR.glob(glob))
+    return sorted(ARTIFACT_DIR.glob(glob))
 
 
 def kernel_params(
@@ -57,12 +57,6 @@ def kernel_params(
         yield pytest.param(kernel, id=kernel.name)
 
 
-def rootfs_params(glob="ubuntu-*.squashfs") -> Iterator:
-    """Return supported rootfs as pytest parameters"""
-    for rootfs in disks(glob=glob):
-        yield pytest.param(rootfs, id=rootfs.name)
-
-
 @dataclass(frozen=True, repr=True)
 class FirecrackerArtifact:
     """Utility class for Firecracker binary artifacts."""