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

Revert "Modify "install_multi" test for PowerPC"

Browse Source 
This reverts commit 8b2977f1d618316ded61420df4fc7d2afd07cbf4.

The initial commit was required for PowerPC
until qemu 2.7.1-6 (in f25) not required anymore
since qemu 2.9.0-5 (in f26)
This commit is contained in:
Michel Normand 2017-08-28 03:55:04 -04:00
parent f3878c4380
commit e6fe996613
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/anaconda.pm
View File

@ -33,19 +33,12 @@ sub select_disks {
assert_and_click "anaconda_main_hub_install_destination"; assert_and_click "anaconda_main_hub_install_destination";
if (get_var('NUMDISKS') > 1) { if (get_var('NUMDISKS') > 1) {
if (get_var('OFW') && ($args{disks} == 1)) {
# we want to select only one disk
# for PowerPC this must be the second one that is empty.
assert_and_click "anaconda_install_destination_select_disk_2";
}
else {
# Multi-disk case. Select however many disks the test needs. If # Multi-disk case. Select however many disks the test needs. If
# $disks is 0, this will do nothing, and 0 disks will be selected. # $disks is 0, this will do nothing, and 0 disks will be selected.
for my $n (1 .. $args{disks}) { for my $n (1 .. $args{disks}) {
assert_and_click "anaconda_install_destination_select_disk_$n"; assert_and_click "anaconda_install_destination_select_disk_$n";
} }
} }
}
else { else {
# Single disk case. # Single disk case.
if ($args{disks} == 0) { if ($args{disks} == 0) {

6
tests/disk_guided_multi_postinstall.pm
View File

@ -5,13 +5,7 @@ use testapi;
sub run { sub run {
assert_screen "root_console"; assert_screen "root_console";
# check that second disk is intact # check that second disk is intact
if (get_var('OFW')) {
# on PowerPC, installation disk is second disk (vdb)
# so need to check vda
assert_script_run 'mount /dev/vda1 /mnt';
} else {
assert_script_run 'mount /dev/vdb1 /mnt'; assert_script_run 'mount /dev/vdb1 /mnt';
}
validate_script_output 'cat /mnt/testfile', sub { $_ =~ m/Hello, world!/ }; validate_script_output 'cat /mnt/testfile', sub { $_ =~ m/Hello, world!/ };
} }