Skip to content

Commit

Permalink
Fix partition raid for UI changes - rest of archs
Browse files Browse the repository at this point in the history
  • Loading branch information
jknphy committed Oct 11, 2018
1 parent 78e3f56 commit 73c3fb9
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions tests/installation/partitioning_raid.pm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ use version_utils qw(is_storage_ng is_sle is_leap is_tumbleweed);
# tumbleweed is not older product, but it didn't roll out yet
my $older_product = is_sle('<15') || is_leap('<15.1') || is_tumbleweed;

sub switch_partitions_tab {
$cmd{addpart} = 'alt-r';
send_key 'alt-p';
assert_screen "partitions-tab";
}

# add a new primary partition
# $type == 3 => 0xFD Linux RAID
sub addpart {
Expand All @@ -34,11 +40,7 @@ sub addpart {
else { die 'Unknown argument'; }

assert_screen "expert-partitioner";
unless ($older_product) {
$cmd{addpart} = 'alt-r';
send_key 'alt-p';
assert_screen "partitions-tab";
}
switch_partitions_tab unless ($older_product);
send_key $cmd{addpart};
# Partitioning type does not appear when GPT disk used, GPT is default for UEFI
# With storage-ng GPT is default, so no partitioning type
Expand Down Expand Up @@ -273,7 +275,8 @@ sub add_prep_boot_partition {
if (is_storage_ng) {
send_key 'down';
assert_screen 'partitioning_raid-disk_vda-selected';
send_key 'alt-d';
switch_partitions_tab unless ($older_product);
send_key $cmd{addpart};
}
else {
send_key 'alt-p';
Expand Down

0 comments on commit 73c3fb9

Please sign in to comment.