Merge pull request #7438 from jknphy/fix_switch_to_console_welcome

Fix switch to console in welcome and addon_dud schedule
os-autoinst · May 14, 2019 · 37c4bbe · 37c4bbe
2 parents 31a20e5 + 9827b7e
commit 37c4bbe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/main_common.pm b/lib/main_common.pm
@@ -808,10 +808,10 @@ sub load_inst_tests {
         loadtest "installation/dud_addon";
     }
     loadtest "installation/welcome";
+    loadtest 'installation/accept_license' if has_license_to_accept;
     if (get_var('DUD_ADDONS') && is_sle('<15')) {
         loadtest "installation/dud_addon";
     }
-    loadtest 'installation/accept_license' if has_license_to_accept;
     loadtest 'installation/network_configuration' if get_var('OFFLINE_SUT');
     if (get_var('IBFT')) {
         loadtest "installation/iscsi_configuration";

diff --git a/tests/installation/welcome.pm b/tests/installation/welcome.pm
@@ -149,10 +149,12 @@ sub run {
         }
         assert_screen('select-product-' . $product);
     }
-
     # Verify install arguments passed by bootloader
     # Linuxrc writes its settings in /etc/install.inf
     if (!is_remote_backend && get_var('VALIDATE_INST_SRC')) {
+        # Ensure to have the focus in some non-selectable control, i.e.: Keyboard Test
+        # before switching to console during installation
+        wait_screen_change { send_key 'alt-y' };
         wait_screen_change { send_key 'ctrl-alt-shift-x' };
         my $method     = uc get_required_var('INSTALL_SOURCE');
         my $mirror_src = get_required_var("MIRROR_$method");