test: add rEFInd icon files to tests for std and bls

Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
projg2 · May 7, 2024 · dc4e11f · dc4e11f
1 parent 10f8913
commit dc4e11f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/test/test_layout_blspec.py b/test/test_layout_blspec.py
@@ -42,6 +42,7 @@ def create_layout(self,
         entry = self.entry_token if entry_token else self.machine_id
         test_spec = [
             f"boot/{subdir}/EFI/Linux/{entry}-1.2.6.efi",
+            f"boot/{subdir}/EFI/Linux/{entry}-1.2.6.png",
             f"boot/{subdir}/EFI/Linux/{entry}-1.2.5.efi",
             f"boot/{subdir}/{entry}/1.2.5/initrd",
             f"boot/{subdir}/{entry}/1.2.5/linux",
@@ -242,6 +243,8 @@ def test_find_modules(self) -> None:
                   '1.2.5'),
                  ('1.2.6',
                   [KernelImage(ukipath / f"{self.machine_id}-1.2.6.efi"),
+                   GenericFile(ukipath / f"{self.machine_id}-1.2.6.png",
+                               KFT.MISC),
                    ModuleDirectory(modules / '1.2.6'),
                    GenericFile(modules / '1.2.6/../../../usr/src/linux',
                                KFT.BUILD),
@@ -373,6 +376,8 @@ def test_exclude_modules(self) -> None:
                   '1.2.5'),
                  ('1.2.6',
                   [KernelImage(ukipath / f"{self.machine_id}-1.2.6.efi"),
+                   GenericFile(ukipath / f"{self.machine_id}-1.2.6.png",
+                               KFT.MISC),
                    GenericFile(modules / '1.2.6/../../../usr/src/linux',
                                KFT.BUILD),
                    ],
@@ -433,6 +438,8 @@ def test_exclude_build(self) -> None:
                   '1.2.5'),
                  ('1.2.6',
                   [KernelImage(ukipath / f"{self.machine_id}-1.2.6.efi"),
+                   GenericFile(ukipath / f"{self.machine_id}-1.2.6.png",
+                               KFT.MISC),
                    ModuleDirectory(modules / '1.2.6'),
                    ],
                   '1.2.6'),
@@ -499,6 +506,8 @@ def test_find_modules_EFI(self) -> None:
                   '1.2.5'),
                  ('1.2.6',
                   [KernelImage(ukipath / f"{self.machine_id}-1.2.6.efi"),
+                   GenericFile(ukipath / f"{self.machine_id}-1.2.6.png",
+                               KFT.MISC),
                    ModuleDirectory(modules / '1.2.6'),
                    GenericFile(modules / '1.2.6/../../../usr/src/linux',
                                KFT.BUILD),

diff --git a/test/test_layout_std.py b/test/test_layout_std.py
@@ -69,6 +69,7 @@ def create_layout(self) -> tempfile.TemporaryDirectory:
         """EFI Stub"""
         test_spec += [
             'efi/EFI/Gentoo/vmlinuz-1.2.1.efi',
+            "efi/EFI/Gentoo/vmlinuz-1.2.1.png",
             'efi/EFI/Gentoo/System.map-1.2.1',
             'efi/EFI/Gentoo/config-1.2.1',
             'efi/EFI/Gentoo/initramfs-1.2.1.img',
@@ -165,6 +166,7 @@ def test_find_modules(self) -> None:
                    GenericFile(efistub / 'config-1.2.1', KFT.CONFIG),
                    GenericFile(efistub / 'initramfs-1.2.1.img', KFT.INITRAMFS),
                    KernelImage(efistub / 'vmlinuz-1.2.1.efi'),
+                   GenericFile(efistub / "vmlinuz-1.2.1.png", KFT.MISC),
                    ModuleDirectory(modules / '1.2.1'),
                    GenericFile(modules / '1.2.1/../../../usr/src/linux',
                                KFT.BUILD),
@@ -219,6 +221,7 @@ def test_exclude_config(self) -> None:
                   [GenericFile(efistub / 'System.map-1.2.1', KFT.SYSTEM_MAP),
                    GenericFile(efistub / 'initramfs-1.2.1.img', KFT.INITRAMFS),
                    KernelImage(efistub / 'vmlinuz-1.2.1.efi'),
+                   GenericFile(efistub / "vmlinuz-1.2.1.png", KFT.MISC),
                    ModuleDirectory(modules / '1.2.1'),
                    GenericFile(modules / '1.2.1/../../../usr/src/linux',
                                KFT.BUILD),
@@ -271,6 +274,7 @@ def test_exclude_modules(self) -> None:
                    GenericFile(efistub / 'config-1.2.1', KFT.CONFIG),
                    GenericFile(efistub / 'initramfs-1.2.1.img', KFT.INITRAMFS),
                    KernelImage(efistub / 'vmlinuz-1.2.1.efi'),
+                   GenericFile(efistub / "vmlinuz-1.2.1.png", KFT.MISC),
                    GenericFile(modules / '1.2.1/../../../usr/src/linux',
                                KFT.BUILD),
                    ],
@@ -321,6 +325,7 @@ def test_exclude_build(self) -> None:
                    GenericFile(efistub / 'config-1.2.1', KFT.CONFIG),
                    GenericFile(efistub / 'initramfs-1.2.1.img', KFT.INITRAMFS),
                    KernelImage(efistub / 'vmlinuz-1.2.1.efi'),
+                   GenericFile(efistub / "vmlinuz-1.2.1.png", KFT.MISC),
                    ModuleDirectory(modules / '1.2.1'),
                    ],
                   '1.2.1'),
@@ -416,6 +421,7 @@ def test_main_list_kernels(self,
 - config: {td}/efi/EFI/Gentoo/config-1.2.1
 - initramfs: {td}/efi/EFI/Gentoo/initramfs-1.2.1.img
 - vmlinuz: {td}/efi/EFI/Gentoo/vmlinuz-1.2.1.efi
+- misc: {td}/efi/EFI/Gentoo/vmlinuz-1.2.1.png
 - modules: {td}/lib/modules/1.2.1
 - build: {td}/lib/modules/1.2.1/../../../usr/src/linux'''.lstrip())
             self.assert_kernels(Path(td))