tests: no need in HFS+ on Apple Macs

Clean up after the 708a8f9 commit.
rhinstaller · Dec 8, 2023 · eff83af · eff83af
1 parent 708a8f9
commit eff83af
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 42 deletions.
diff --git a/pyanaconda/modules/storage/platform.py b/pyanaconda/modules/storage/platform.py
@@ -43,7 +43,6 @@
 MBR_DESCRIPTION = N_("Master Boot Record")
 EFI_DESCRIPTION = N_("EFI System Partition")
 PREP_BOOT_DESCRIPTION = N_("PReP Boot Partition")
-APPLE_EFI_DESCRIPTION = N_("Apple EFI Boot Partition")
 APPLE_BOOTSTRAP_DESCRIPTION = N_("Apple Bootstrap Partition")
 DASD_DESCRIPTION = N_("DASD")
 ZFCP_DESCRIPTION = N_("zFCP")

diff --git a/tests/unit_tests/pyanaconda_tests/modules/storage/test_module_bootloader.py b/tests/unit_tests/pyanaconda_tests/modules/storage/test_module_bootloader.py
@@ -37,7 +37,7 @@
 from pyanaconda.modules.storage import platform
 from pyanaconda.modules.storage.bootloader import BootLoaderFactory
 from pyanaconda.modules.storage.bootloader.base import BootLoader
-from pyanaconda.modules.storage.bootloader.efi import EFIGRUB, MacEFIGRUB, Aarch64EFIGRUB, ArmEFIGRUB
+from pyanaconda.modules.storage.bootloader.efi import EFIGRUB, Aarch64EFIGRUB, ArmEFIGRUB
 from pyanaconda.modules.storage.bootloader.extlinux import EXTLINUX
 from pyanaconda.modules.storage.bootloader.grub2 import GRUB2, IPSeriesGRUB2, PowerNVGRUB2
 from pyanaconda.modules.storage.bootloader.zipl import ZIPL
@@ -784,7 +784,6 @@ def test_get_class_by_platform(self):
         boot_loader_by_platform = {
             platform.X86: GRUB2,
             platform.EFI: EFIGRUB,
-            platform.MacEFI: MacEFIGRUB,
             platform.PPC: GRUB2,
             platform.IPSeriesPPC: IPSeriesGRUB2,
             platform.PowerNV: PowerNVGRUB2,

diff --git a/tests/unit_tests/pyanaconda_tests/modules/storage/test_platform.py b/tests/unit_tests/pyanaconda_tests/modules/storage/test_platform.py
@@ -23,7 +23,7 @@
 from blivet.size import Size
 from pyanaconda.modules.storage.partitioning.specification import PartSpec
 from pyanaconda.modules.storage.platform import X86, get_platform, NewWorldPPC, IPSeriesPPC, \
-    PowerNV, PS3, S390, ARM, MacEFI, Aarch64EFI, EFI
+    PowerNV, PS3, S390, ARM, Aarch64EFI, EFI
 
 
 class PlatformTestCase(unittest.TestCase):
@@ -204,44 +204,6 @@ def test_efi(self, arch):
             )
         )
 
-    @patch("pyanaconda.modules.storage.platform.arch")
-    def test_mac_efi(self, arch):
-        """Test the Mac EFI platform."""
-        self._reset_arch(arch)
-        arch.is_efi.return_value = True
-        arch.is_mactel.return_value = True
-
-        self._check_platform(
-            platform_cls=MacEFI,
-            packages=["mactel-boot"],
-            non_linux_format_types=["macefi"],
-        )
-
-        self._check_partitions(
-            PartSpec(mountpoint="/boot/efi", fstype="macefi", grow=True,
-                     size=Size("200MiB"), max_size=Size("600MiB")),
-            PartSpec(mountpoint="/boot", size=Size("1GiB")),
-        )
-
-        self._check_constraints(
-            constraints={
-                "format_types": ["macefi"],
-                "device_types": ["partition", "mdarray"],
-                "mountpoints": ["/boot/efi"],
-                "raid_levels": [raid.RAID1],
-                "raid_metadata": ["1.0"]
-            },
-            descriptions={
-                "partition": "Apple EFI Boot Partition",
-                "mdarray": "RAID Device"
-            },
-            error_message=str(
-                "For a UEFI installation, you must include "
-                "a Linux HFS+ ESP on a GPT-formatted "
-                "disk, mounted at /boot/efi."
-            )
-        )
-
     @patch("pyanaconda.modules.storage.platform.arch")
     def test_aarch64_efi(self, arch):
         """Test the Aarch64 EFI platform."""