From e1ed9960f37acd69d490747dbc6f7073a2def173 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 6 Jun 2022 18:34:44 -0700
Subject: [PATCH] Let _console_avc_crash wait a bit longer for console login

On Rawhide update tests we often don't seem to get to the login
prompt in 10 seconds, so tweak the code a bit to let us specify
a timeout in root_console, and use 30 seconds here.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 lib/installedtest.pm        | 3 ++-
 tests/_console_avc_crash.pm | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/installedtest.pm b/lib/installedtest.pm
index 2c5e7702..a47ef3db 100644
--- a/lib/installedtest.pm
+++ b/lib/installedtest.pm
@@ -17,6 +17,7 @@ sub root_console {
     my $self = shift;
     my %args = (
         tty => 1, # what TTY to login to
+        timeout => 0, # passed through to console_login
         @_);
     if (get_var("SERIAL_CONSOLE")) {
         # select the first virtio terminal, for now we assume we can
@@ -27,7 +28,7 @@ sub root_console {
         # For normal terminal emulation, use key combo to reach a tty
         send_key "ctrl-alt-f$args{tty}";
     }
-    console_login; # Do the login.
+    console_login(timeout=>$args{timeout}); # Do the login.
 }
 
 sub post_fail_hook {
diff --git a/tests/_console_avc_crash.pm b/tests/_console_avc_crash.pm
index 1bbea36a..ee3a591e 100644
--- a/tests/_console_avc_crash.pm
+++ b/tests/_console_avc_crash.pm
@@ -5,7 +5,7 @@ use testapi;
 
 sub run {
     my $self = shift;
-    $self->root_console(tty=>3);
+    $self->root_console(tty=>3, timeout=>30);
     # if this is a non-English, non-switched layout, load US layout
     # at this point
     # FIXME: this is all kind of a mess, as on such configs we need