test: fix the testcase strings to not include osinfo_template

This commit fixes the testcase string representation to not include
the `osinfo_template` string and adds a test case to not accidentally
regress here. Currently our test case strings look like:
```
<Dir bootc-image-builder>
  <Dir test>
    <Module test_build.py>
      <Function test_container_builds>
      <Function test_image_is_generated[quay.io/centos-bootc/centos-bootc:stream9,qcow2+raw+vmdk+vhd+gce,CentOS Stream 9 ({arch})]>
      <Function test_image_boots[quay.io/centos-bootc/centos-bootc:stream9,raw,CentOS Stream 9 ({arch})]>
...
```
which is an accident. A testcase should ideally only contain what

Instead of putting the osinfo_template into the testcase itself,
have a function that generates it. It has downsides (now the
osinfo_template is more disconnected from the testcase) so we could
move it also back into testcase or we could exclude osinfo_template
from the string generation. Ideas welcome here, my current approach
feels okay but not like it's perfect yet.

test/test_build.py

@@ -35,7 +35,6 @@ class ImageBuildResult(NamedTuple):
     img_type: str
     img_path: str
     img_arch: str
-    osinfo_template: str
     container_ref: str
     rootfs: str
     username: str
@@ -163,7 +162,7 @@ def build_images(shared_tmpdir, build_container, request, force_aws_upload):
             journal_output = journal_log_path.read_text(encoding="utf8")
             bib_output = bib_output_path.read_text(encoding="utf8")
             results.append(ImageBuildResult(
-                image_type, generated_img, tc.target_arch, tc.osinfo_template,
+                image_type, generated_img, tc.target_arch,
                 tc.container_ref, tc.rootfs, username, password,
                 ssh_keyfile_private_path, kargs, bib_output, journal_output))
 
@@ -298,7 +297,7 @@ def del_ami():
     results = []
     for image_type in image_types:
         results.append(ImageBuildResult(
-            image_type, artifact[image_type], tc.target_arch, tc.osinfo_template,
+            image_type, artifact[image_type], tc.target_arch,
             tc.container_ref, tc.rootfs, username, password,
             ssh_keyfile_private_path, kargs, bib_output, journal_output, metadata))
     yield results
@@ -453,20 +452,28 @@ def test_iso_installs(image_type):
         assert_kernel_args(vm, image_type)
 
 
+def osinfo_for(it: ImageBuildResult, arch: str) -> str:
+    if it.container_ref == "quay.io/centos-bootc/centos-bootc:stream9":
+        return f"CentOS Stream 9 ({arch})"
+    if it.container_ref.startswith("quay.io/fedora/fedora-bootc:"):
+        ver = it.container_ref.split(":", maxsplit=2)[1]
+        return f"Fedora Server {ver} ({arch})"
+    raise ValueError(f"cannot find osinfo_template for '{it.container_ref}'")
+
+
 @pytest.mark.skipif(platform.system() != "Linux", reason="osinfo detect test only runs on linux right now")
 @pytest.mark.parametrize("image_type", gen_testcases("anaconda-iso"), indirect=["image_type"])
 def test_iso_os_detection(image_type):
     installer_iso_path = image_type.img_path
     arch = image_type.img_arch
     if not arch:
         arch = platform.machine()
-    osinfo = image_type.osinfo_template.format(arch=arch)
     result = subprocess.run([
         "osinfo-detect",
         installer_iso_path,
     ], capture_output=True, text=True, check=True)
     osinfo_output = result.stdout
-    expected_output = f"Media is bootable.\nMedia is an installer for OS '{osinfo}'\n"
+    expected_output = f"Media is bootable.\nMedia is an installer for OS '{osinfo_for(image_type, arch)}'\n"
     assert osinfo_output == expected_output
 
 

test/testcases.py

@@ -41,22 +41,29 @@ def __str__(self):
 class TestCaseFedora(TestCase):
     container_ref: str = "quay.io/fedora/fedora-bootc:40"
     rootfs: str = "btrfs"
-    osinfo_template: str = "Fedora Server 40 ({arch})"
 
 
 @dataclasses.dataclass
 class TestCaseFedora42(TestCase):
     container_ref: str = "quay.io/fedora/fedora-bootc:42"
     rootfs: str = "btrfs"
-    osinfo_template: str = "Fedora Server 42 ({arch})"
 
 
 @dataclasses.dataclass
 class TestCaseCentos(TestCase):
     container_ref: str = os.getenv(
         "BIB_TEST_BOOTC_CONTAINER_TAG",
         "quay.io/centos-bootc/centos-bootc:stream9")
-    osinfo_template: str = "CentOS Stream 9 ({arch})"
+
+
+def test_testcase_nameing():
+    """
+    Ensure the testcase naming does not change without us knowing as those
+    are visible when running "pytest --collect-only"
+    """
+    tc = TestCaseFedora()
+    expected = "quay.io/fedora/fedora-bootc:40,btrfs"
+    assert f"{tc}" == expected, f"{tc} != {expected}"
 
 
 def gen_testcases(what):  # pylint: disable=too-many-return-statements