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

Increase partition count and test for swap #15

Merged
tcooper merged 1 commits from fix_issue_11 into develop 2021-08-22 01:39:48 +00:00
Conversation 3 Commits 1 Files Changed 1 +5 -2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cb4b26ea5e - Show all commits

7
tests/disk_custom_standard_partition_ext4_postinstall.pm
View File

@ -4,13 +4,15 @@ use testapi;
sub run { sub run {
assert_screen "root_console"; assert_screen "root_console";
my $count = 3; my $count = 4;
my $devroot = 'vda1'; my $devroot = 'vda1';
my $devboot = 'vda2'; my $devboot = 'vda2';
my $devswap = 'vda3';
if (get_var('OFW') || get_var('UEFI')) { if (get_var('OFW') || get_var('UEFI')) {
$count = 4; # extra boot partition (PreP or ESP) $count = 5; # extra boot partition (PreP or ESP)
$devroot = 'vda2'; $devroot = 'vda2';
$devboot = 'vda3'; $devboot = 'vda3';
$devswap = 'vda4';
} }
# check number of partitions # check number of partitions
script_run 'fdisk -l | grep /dev/vda'; # debug script_run 'fdisk -l | grep /dev/vda'; # debug
@ -19,6 +21,7 @@ sub run {
script_run 'mount | grep /dev/vda'; # debug script_run 'mount | grep /dev/vda'; # debug
validate_script_output "mount | grep /dev/$devboot", sub { $_ =~ m/on \/boot type ext4/ }; validate_script_output "mount | grep /dev/$devboot", sub { $_ =~ m/on \/boot type ext4/ };
validate_script_output "mount | grep /dev/$devroot", sub { $_ =~ m/on \/ type ext4/ }; validate_script_output "mount | grep /dev/$devroot", sub { $_ =~ m/on \/ type ext4/ };
validate_script_output "swapon --show | grep /dev/$devswap", sub { $_ =~ m/ partition / };
} }
sub test_flags { sub test_flags {