srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-22 05:53:09 +00:00
Code Issues Releases Activity

Use longer timeout for root console switch after liveinst

Browse Source 
For some reason, in recent tests, switching to a console after
live install completes is taking a long time, and tests are
failing because we 'only' allow 10 seconds for the login prompt
to appear. This seems to indicate some kind of performance bug,
but we don't really want all liveinst tests to fail on in, this
is not primarily a performance testing framework. So let's
tweak the root_console / console_login bits a bit to allow a
configurable timeout for the login prompt to appear, and use
that to wait 30 secs instead of 10 in this case.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-10-06 08:44:34 -07:00
parent 6e262be28b
commit 9869920f5b
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/anacondatest.pm
View File

@ -61,6 +61,9 @@ sub root_console {
# Switch to an appropriate TTY and log in as root. # Switch to an appropriate TTY and log in as root.
my $self = shift; my $self = shift;
my %args = ( my %args = (
# 0 means use console_login's default, non-zero values
# passed to console_login
timeout => 0,
@_); @_);
# Handle https://bugzilla.redhat.com/show_bug.cgi?id=1635033 # Handle https://bugzilla.redhat.com/show_bug.cgi?id=1635033
if (get_var("LIVE") && get_var("DESKTOP") eq "gnome") { if (get_var("LIVE") && get_var("DESKTOP") eq "gnome") {
@ -69,7 +72,7 @@ sub root_console {
else { else {
send_key "ctrl-alt-f2"; send_key "ctrl-alt-f2";
} }
console_login(user=>"root"); console_login(user=>"root", timeout=>$args{timeout});
} }
1; 1;

5
lib/utils.pm
View File

@ -152,7 +152,10 @@ sub console_login {
my %args = ( my %args = (
user => "root", user => "root",
password => get_var("ROOT_PASSWORD", "weakpassword"), password => get_var("ROOT_PASSWORD", "weakpassword"),
# default is 10 seconds, set below, 0 means 'default'
timeout => 0;
@_); @_);
$args{timeout} ||= 10;
# There's a timing problem when we switch from a logged-in console # There's a timing problem when we switch from a logged-in console
# to a non-logged in console and immediately call this function; # to a non-logged in console and immediately call this function;
@ -179,7 +182,7 @@ sub console_login {
sleep 2; sleep 2;
} }
check_screen [$good, 'text_console_login'], 10; check_screen [$good, 'text_console_login'], $args{timeout};
# if we're already logged in, all is good # if we're already logged in, all is good
if (match_has_tag $good) { if (match_has_tag $good) {
_console_login_finish(); _console_login_finish();

5
tests/_do_install_and_reboot.pm
View File

@ -117,8 +117,9 @@ sub run {
assert_and_click "anaconda_install_done"; assert_and_click "anaconda_install_done";
if (get_var('LIVE')) { if (get_var('LIVE')) {
# reboot from a console, it's more reliable than the desktop # reboot from a console, it's more reliable than the desktop
# runners # runners. As of 2018-10 switching to console after liveinst
$self->root_console; # seems to take a long time, so use a longer timeout here
$self->root_console(timeout=>30);
# if we didn't set a root password during install, set it # if we didn't set a root password during install, set it
# now...this is kinda icky, but I don't see a great option # now...this is kinda icky, but I don't see a great option
if (get_var("INSTALLER_NO_ROOT")) { if (get_var("INSTALLER_NO_ROOT")) {