From 2a3e67991bccba9d5045acb44fc8507268f6e6ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20R=C5=AF=C5=BEi=C4=8Dka?= Date: Tue, 26 May 2020 18:05:38 +0200 Subject: [PATCH] Whitelist not recognized needles in check-needles.py --- check-needles.py | 4 +++- .../blivet/anaconda_blivet_part_inactive_boot.json | 2 +- tests/disk_custom_blivet_resize.pm | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/check-needles.py b/check-needles.py index f5b74d9b..0f6db05d 100755 --- a/check-needles.py +++ b/check-needles.py @@ -78,8 +78,10 @@ for user in ("jack", "jim"): testliterals.append(f"user_confirm_{user}") # partitioning stuff, there's a bunch of this, all in anaconda.pm # multiple things use this -for part in ("swap", "root"): +for part in ("swap", "root", "ext4", "efi", "boot"): testliterals.append(f"anaconda_part_select_{part}") + testliterals.append(f"anaconda_blivet_part_select_{part}") + testliterals.append(f"anaconda_blivet_part_inactive_{part}") # select_disks for num in range(1, 10): testliterals.append(f"anaconda_install_destination_select_disk_{num}") diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_boot.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_boot.json index 60fd9153..a2e1ad7e 100644 --- a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_boot.json +++ b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_boot.json @@ -10,6 +10,6 @@ ], "properties": [], "tags": [ - "anaconda_blivet_part_inactive_bootpart" + "anaconda_blivet_part_inactive_boot" ] } \ No newline at end of file diff --git a/tests/disk_custom_blivet_resize.pm b/tests/disk_custom_blivet_resize.pm index b1ec032d..bf398a82 100644 --- a/tests/disk_custom_blivet_resize.pm +++ b/tests/disk_custom_blivet_resize.pm @@ -42,7 +42,7 @@ sub run { } # Select the boot partition and reformat it and remount. - activate("bootpart"); + activate("boot"); # Boot is the only ext4 partition on that scheme, so we will use that to make a needle. wait_still_screen 5; custom_blivet_format_partition(type => 'ext4', label => 'boot', mountpoint => '/boot');