testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Make raidlevel parameter less confusing

Browse Source
This commit is contained in:
Al Bowles 2021-10-21 18:49:12 -05:00
parent f0b0988f4b
commit cf0e86e9a9
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/anaconda.pm
View File

@ -182,13 +182,13 @@ sub custom_add_partition {
# (anaconda_custom_part_fs_$filesystem should exist) and mountpoint of that partition (e. g. string "/boot"). # (anaconda_custom_part_fs_$filesystem should exist) and mountpoint of that partition (e. g. string "/boot").
my %args = ( my %args = (
devicetype => "", devicetype => "",
raid1 => 0, raidlevel => 0,
size => 0, size => 0,
filesystem => "", filesystem => "",
mountpoint => "", mountpoint => "",
@_ @_
); );
$args{devicetype} = "raid" if $args{raid1}; $args{devicetype} = "raid" if $args{raidlevel};
# send tab until 'add' button is selected, then press # send tab until 'add' button is selected, then press
# the number of tabs needed seems to depend on whether a partition has already been added # the number of tabs needed seems to depend on whether a partition has already been added
@ -230,13 +230,11 @@ sub custom_add_partition {
send_key_until_needlematch("anaconda_custom_part_fs_$args{filesystem}_selected", "down"); send_key_until_needlematch("anaconda_custom_part_fs_$args{filesystem}_selected", "down");
send_key "spc"; send_key "spc";
} }
if ($args{raid1}) { if ($args{raidlevel}) {
# send 'tab' until Raid Level dropdown is selected # send 'tab' until Raid Level dropdown is selected
send_key_until_needlematch("anaconda_custom_part_raidlevel_selected", "tab"); send_key_until_needlematch("anaconda_custom_part_raidlevel_selected", "tab");
send_key "spc"; send_key "spc";
#choose RAID level from dropdown #choose RAID level from dropdown
# needle name specified like this is interpreted as "anaconda_custom_part_raid__selected"
#send_key_until_needlematch("anaconda_custom_part_raid_$args{raidl}_selected", "down");
send_key_until_needlematch("anaconda_custom_part_raid_1_selected", "down"); send_key_until_needlematch("anaconda_custom_part_raid_1_selected", "down");
send_key "spc"; send_key "spc";
} }

2
tests/disk_custom_gui_software_raid.pm
View File

@ -20,7 +20,7 @@ sub run {
custom_add_partition(size => 512, mountpoint => '/boot'); custom_add_partition(size => 512, mountpoint => '/boot');
custom_add_partition(filesystem => 'swap', size => 512, mountpoint => 'swap'); custom_add_partition(filesystem => 'swap', size => 512, mountpoint => 'swap');
custom_add_partition(raidl => 1, mountpoint => '/', devicetype => 'raid'); custom_add_partition(raidlevel => 1, mountpoint => '/');
assert_and_click "anaconda_spoke_done"; assert_and_click "anaconda_spoke_done";
assert_and_click "anaconda_part_accept_changes"; assert_and_click "anaconda_part_accept_changes";