From 729a25670f413f91acbdc61adb2bd4079b9e5941 Mon Sep 17 00:00:00 2001 From: Radek Vykydal Date: Mon, 11 Dec 2023 07:55:37 +0100 Subject: [PATCH] Update the tests for /boot not being required --- test/check-storage | 123 ++++++++++++++++++++-------------------- test/helpers/storage.py | 8 +-- 2 files changed, 65 insertions(+), 66 deletions(-) diff --git a/test/check-storage b/test/check-storage index 7d30f3cd80..b7308e942e 100755 --- a/test/check-storage +++ b/test/check-storage @@ -395,13 +395,13 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase, StorageHelpers) # verify gathered requests # root partition is not auto-mapped - s.check_mountpoint_row(1, "/boot", "Select a device", False) - s.select_mountpoint_row_device(1, f"{dev}2") - s.check_mountpoint_row_format_type(1, "ext4") + s.check_mountpoint_row(1, "/", "Select a device", True) + s.select_mountpoint_row_device(1, f"btrfstest") + s.check_mountpoint_row_format_type(1, "btrfs") - s.check_mountpoint_row(2, "/", "Select a device", True) - s.select_mountpoint_row_device(2, f"btrfstest") - s.check_mountpoint_row_format_type(2, "btrfs") + s.check_mountpoint_row(2, "/boot", "Select a device", False) + s.select_mountpoint_row_device(2, f"{dev}2") + s.check_mountpoint_row_format_type(2, "ext4") s.add_mountpoint_row() s.select_mountpoint_row_device(3, f"{dev}4") @@ -410,8 +410,8 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase, StorageHelpers) s.check_mountpoint_row_format_type(3, "xfs") # Toggle reformat option - s.select_mountpoint_row_reformat(1) - s.check_mountpoint_row_reformat(1, True) + s.select_mountpoint_row_reformat(2) + s.check_mountpoint_row_reformat(2, True) b.assert_pixels( "#app", @@ -481,9 +481,9 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase, StorageHelpers) s.select_mountpoint([(dev, True)]) # verify gathered requests - s.select_mountpoint_row_device(1, f"{dev}2") - s.check_mountpoint_row(1, "/boot", f"{dev}2", False, "ext4") - s.check_mountpoint_row(2, "/", "Select a device", True) + s.select_mountpoint_row_device(2, f"{dev}2") + s.check_mountpoint_row(1, "/", "Select a device", True) + s.check_mountpoint_row(2, "/boot", f"{dev}2", False, "ext4") s.add_mountpoint_row() s.select_mountpoint_row_device(3, f"{dev}4") @@ -533,11 +533,11 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase, StorageHelpers) s.check_mountpoint_row_device_available(1, "vda2", True) s.check_mountpoint_row_device_available(1, "vdb1") - s.select_mountpoint_row_device(1, f"{dev1}2") - s.check_mountpoint_row(1, "/boot", f"{dev1}2", False, "xfs") + s.select_mountpoint_row_device(1, f"{dev1}3") + s.check_mountpoint_row(1, "/", f"{dev1}3", True, "xfs") - s.select_mountpoint_row_device(2, f"{dev1}3") - s.check_mountpoint_row(2, "/", f"{dev1}3", True, "xfs") + s.select_mountpoint_row_device(2, f"{dev1}2") + s.check_mountpoint_row(2, "/boot", f"{dev1}2", False, "xfs") s.add_mountpoint_row() s.select_mountpoint_row_device(3, f"{dev2}1") @@ -571,7 +571,6 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase, StorageHelpers) s = Storage(b, m) r = Review(b) - # BIOS boot partition, /boot partition, / disk1 = "/dev/vda" dev1 = "vda" s.partition_disk( @@ -621,16 +620,16 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase, StorageHelpers) s.unlock_device("einszweidreivier", ["vda4"], ["vda4"]) b.wait_not_present("#mount-point-mapping-table tbody tr:nth-child(4) td[data-label='Format type'] #unlock-luks-btn") - s.check_mountpoint_row_mountpoint(1, "/boot") - s.select_mountpoint_row_device(1, "vda5") + s.check_mountpoint_row_mountpoint(2, "/boot") + s.select_mountpoint_row_device(2, "vda5") - s.check_mountpoint_row_mountpoint(2, "/") - selector = "#mount-point-mapping-table-row-2 .pf-v5-c-select__toggle" + s.check_mountpoint_row_mountpoint(1, "/") + selector = "#mount-point-mapping-table-row-1 .pf-v5-c-select__toggle" b.click(f"{selector}:not([disabled]):not([aria-disabled=true])") select_entry = f"{selector} + ul li:nth-of-type(3) button" b.click(select_entry) b.wait_in_text(f"{selector} .pf-v5-c-select__toggle-text", "luks") - s.check_mountpoint_row_format_type(2, "xfs") + s.check_mountpoint_row_format_type(1, "xfs") self.addCleanup(lambda: dbus_reset_users(self.machine)) i.reach(i.steps.REVIEW) @@ -670,14 +669,14 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase, StorageHelpers) s.unlock_device("einszweidrei", ["vda3", "vda4"], ["vda3", "vda4"]) b.wait_not_present("#mount-point-mapping-table tbody tr:nth-child(4) td[data-label='Format type'] #unlock-luks-btn") - s.check_mountpoint_row_mountpoint(1, "/boot") - s.select_mountpoint_row_device(1, f"{dev}2") - s.select_mountpoint_row_reformat(1) - s.check_mountpoint_row_reformat(1, True) + s.check_mountpoint_row(1, "/", "Select a device", True) + s.select_mountpoint_row_device(1, "encryptedraid") + s.check_mountpoint_row_format_type(1, "xfs") - s.check_mountpoint_row(2, "/", "Select a device", True) - s.select_mountpoint_row_device(2, "encryptedraid") - s.check_mountpoint_row_format_type(2, "xfs") + s.check_mountpoint_row_mountpoint(2, "/boot") + s.select_mountpoint_row_device(2, f"{dev}2") + s.select_mountpoint_row_reformat(2) + s.check_mountpoint_row_reformat(2, True) self.addCleanup(lambda: dbus_reset_users(self.machine)) i.reach(i.steps.REVIEW) @@ -719,18 +718,18 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase, StorageHelpers) s.unlock_device("einszweidrei", ["encryptedraid"], ["encryptedraid"]) b.wait_not_present("#mount-point-mapping-table tbody tr:nth-child(4) td[data-label='Format type'] #unlock-luks-btn") - s.check_mountpoint_row_mountpoint(1, "/boot") - s.select_mountpoint_row_device(1, f"{dev}2") - s.select_mountpoint_row_reformat(1) - s.check_mountpoint_row_reformat(1, True) + s.check_mountpoint_row_mountpoint(2, "/boot") + s.select_mountpoint_row_device(2, f"{dev}2") + s.select_mountpoint_row_reformat(2) + s.check_mountpoint_row_reformat(2, True) - s.check_mountpoint_row_mountpoint(2, "/") - selector = "#mount-point-mapping-table-row-2 .pf-v5-c-select__toggle" + s.check_mountpoint_row_mountpoint(1, "/") + selector = "#mount-point-mapping-table-row-1 .pf-v5-c-select__toggle" b.click(f"{selector}:not([disabled]):not([aria-disabled=true])") select_entry = f"{selector} + ul li:nth-of-type(2) button" b.click(select_entry) b.wait_in_text(f"{selector} .pf-v5-c-select__toggle-text", "luks") - s.check_mountpoint_row_format_type(2, "xfs") + s.check_mountpoint_row_format_type(1, "xfs") self.addCleanup(lambda: dbus_reset_users(self.machine)) i.reach(i.steps.REVIEW) @@ -776,13 +775,13 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase, StorageHelpers) # verify gathered requests # root partition is not auto-mapped - s.check_mountpoint_row(1, "/boot", "Select a device", False) - s.select_mountpoint_row_device(1, f"{dev}2") - s.check_mountpoint_row_format_type(1, "ext4") + s.check_mountpoint_row(1, "/", "Select a device", True) + s.select_mountpoint_row_device(1, "root") + s.check_mountpoint_row_format_type(1, "btrfs") - s.check_mountpoint_row(2, "/", "Select a device", True) - s.select_mountpoint_row_device(2, "root") - s.check_mountpoint_row_format_type(2, "btrfs") + s.check_mountpoint_row(2, "/boot", "Select a device", False) + s.select_mountpoint_row_device(2, f"{dev}2") + s.check_mountpoint_row_format_type(2, "ext4") s.add_mountpoint_row() s.select_mountpoint_row_device(3, "home") @@ -791,8 +790,8 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase, StorageHelpers) s.check_mountpoint_row_format_type(3, "btrfs") # Toggle reformat option - s.select_mountpoint_row_reformat(1) - s.check_mountpoint_row_reformat(1, True) + s.select_mountpoint_row_reformat(2) + s.check_mountpoint_row_reformat(2, True) self.addCleanup(lambda: dbus_reset_users(self.machine)) i.reach(i.steps.REVIEW) @@ -821,8 +820,8 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase, StorageHelpers) s.rescan_disks() s.select_mountpoint([(dev, True)]) - s.select_mountpoint_row_device(1, f"{dev}2") - s.select_mountpoint_row_device(2, "root") + s.select_mountpoint_row_device(1, "root") + s.select_mountpoint_row_device(2, f"{dev}2") s.add_mountpoint_row() s.select_mountpoint_row_device(3, "home") s.select_mountpoint_row_mountpoint(3, "/home") @@ -934,14 +933,14 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase, StorageHelpers) # verify gathered requests # root partition is not auto-mapped - s.check_mountpoint_row(1, "/boot", "Select a device", False) - s.check_mountpoint_row(2, "/", "Select a device", True) + s.check_mountpoint_row(1, "/", "Select a device", True) + s.check_mountpoint_row(2, "/boot", "Select a device", False) - s.select_mountpoint_row_device(1, f"{dev}2") - s.check_mountpoint_row(1, "/boot", f"{dev}2", False, "ext4") + s.select_mountpoint_row_device(1, f"{vgname}-root") + s.check_mountpoint_row(1, "/", f"{vgname}-root", True, "ext4") - s.select_mountpoint_row_device(2, f"{vgname}-root") - s.check_mountpoint_row(2, "/", f"{vgname}-root", True, "ext4") + s.select_mountpoint_row_device(2, f"{dev}2") + s.check_mountpoint_row(2, "/boot", f"{dev}2", False, "ext4") s.add_mountpoint_row() s.select_mountpoint_row_device(3, f"{vgname}-home") @@ -953,8 +952,8 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase, StorageHelpers) s.check_mountpoint_row(4, "swap", f"{vgname}-swap", False, "swap") # Toggle reformat option - s.select_mountpoint_row_reformat(1) - s.check_mountpoint_row_reformat(1, True) + s.select_mountpoint_row_reformat(2) + s.check_mountpoint_row_reformat(2, True) self.addCleanup(lambda: dbus_reset_users(self.machine)) i.reach(i.steps.REVIEW) @@ -1033,17 +1032,17 @@ class TestStorageMountPointsEFI(anacondalib.VirtInstallMachineCase): # verify gathered requests # root partition is not auto-mapped - s.check_mountpoint_row(1, "/boot/efi", "Select a device", False) - s.select_mountpoint_row_device(1, f"{dev}1") - s.check_mountpoint_row_format_type(1, "EFI System Partition") + s.check_mountpoint_row(1, "/", "Select a device", True) + s.select_mountpoint_row_device(1, f"{dev}3") + s.check_mountpoint_row_format_type(1, "xfs") - s.check_mountpoint_row(2, "/boot", "Select a device", False) - s.select_mountpoint_row_device(2, f"{dev}2") - s.check_mountpoint_row_format_type(2, "ext4") + s.check_mountpoint_row(2, "/boot/efi", "Select a device", False) + s.select_mountpoint_row_device(2, f"{dev}1") + s.check_mountpoint_row_format_type(2, "EFI System Partition") - s.check_mountpoint_row(3, "/", "Select a device", True) - s.select_mountpoint_row_device(3, f"{dev}3") - s.check_mountpoint_row_format_type(3, "xfs") + s.check_mountpoint_row(3, "/boot", "Select a device", False) + s.select_mountpoint_row_device(3, f"{dev}2") + s.check_mountpoint_row_format_type(3, "ext4") self.addCleanup(lambda: dbus_reset_users(self.machine)) i.reach(i.steps.REVIEW) diff --git a/test/helpers/storage.py b/test/helpers/storage.py index 9849e98936..7139ff85fd 100644 --- a/test/helpers/storage.py +++ b/test/helpers/storage.py @@ -353,8 +353,8 @@ def disks_loaded(self, disks): def check_mountpoint_row(self, row, mountpoint=None, device=None, reformat=None, format_type=None): if mountpoint: - required = ["/", "/boot", "/boot/efi", "swap"].count(mountpoint) - self.check_mountpoint_row_mountpoint(row, mountpoint, required) + constrained = ["/", "/boot", "/boot/efi", "swap"].count(mountpoint) + self.check_mountpoint_row_mountpoint(row, mountpoint, constrained) if device: self.check_mountpoint_row_device(row, device) if reformat: @@ -392,8 +392,8 @@ def toggle_mountpoint_row_device(self, row): def check_mountpoint_row_device(self, row, device): self.browser.wait_text(f"{self.table_row(row)} .pf-v5-c-select__toggle-text", device) - def check_mountpoint_row_mountpoint(self, row, mountpoint, isRequired=True): - if isRequired: + def check_mountpoint_row_mountpoint(self, row, mountpoint, constrained=True): + if constrained: self.browser.wait_text(f"{self.table_row(row)}-mountpoint", mountpoint) else: self.browser.wait_val(f"{self.table_row(row)}-mountpoint", mountpoint)