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

merge #161 and #163 to main #164

Merged
tcooper merged 8 commits from develop into main 2023-03-23 14:11:02 +00:00
Conversation 0 Commits 8 Files Changed 17 +6 -9
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 220ee770ba - Show all commits

10
tests/_boot_to_anaconda.pm
View File

@ -104,14 +104,16 @@ sub run {
unless (wait_serial "Installation") { die "Text version of Anaconda has not started."; } unless (wait_serial "Installation") { die "Text version of Anaconda has not started."; }
} }
else { else {
if (get_var("DISTRI") eq "rocky") { if (get_var("DISTRI") eq "rocky" && (get_version_major() < 9)) {
# Rocky doesn't have network enabled at boot so we are not prompted # Rocky Linux 8 doesn't have network enabled at boot so we
# for VNC... # are not prompted for VNC. If that changes in future update
# this conditional can be removed and the else condition
# can be restored as the default / only option.
# wait for text version of Anaconda main hub # wait for text version of Anaconda main hub
assert_screen "anaconda_main_hub_text", 300; assert_screen "anaconda_main_hub_text", 300;
} }
else { else {
# Fedora has a use text mode menu here # Fedora and Rocky Linux 9+ have a 'Use text mode' menu here
assert_screen "anaconda_use_text_mode", 300; assert_screen "anaconda_use_text_mode", 300;
type_string "2\n"; type_string "2\n";
# wait for text version of Anaconda main hub # wait for text version of Anaconda main hub

5
tests/install_text.pm
View File

@ -105,11 +105,6 @@ sub run {
console_type_wait("1\n"); # create new console_type_wait("1\n"); # create new
console_type_wait("3\n"); # set username console_type_wait("3\n"); # set username
console_type_wait("$username\n"); console_type_wait("$username\n");
# from Rawhide-20190503.n.0 (F31) onwards, 'use password' is default
if ((get_release_number() < 31) || (get_version_major() < 9)) {
# typing "4\n" on abrt screen causes system to reboot, so be careful
run_with_error_check(sub { console_type_wait("4\n") }, $error); # use password
}
console_type_wait("5\n"); # set password console_type_wait("5\n"); # set password
console_type_wait("$userpwd\n"); console_type_wait("$userpwd\n");
console_type_wait("$userpwd\n"); console_type_wait("$userpwd\n");