diff --git a/test/test_layout_blspec.py b/test/test_layout_blspec.py index 45dac34..4c98e75 100644 --- 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}/EFI/Linux/config-1.2.5", f"boot/{subdir}/EFI/Linux/System.map-1.2.5", @@ -246,6 +247,7 @@ 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), @@ -381,6 +383,7 @@ 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), ], @@ -443,6 +446,7 @@ 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'), @@ -511,6 +515,7 @@ 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 index 51e7c6e..a960656 100644 --- 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))