Skip to content

Commit

Permalink
Merge pull request os-autoinst#18328 from os-autoinst/revert-18135-im…
Browse files Browse the repository at this point in the history
…prove-maximize-window-poo#138248

Revert "Improve maximize window poo#138248"
  • Loading branch information
pablo-herranz authored Dec 15, 2023
2 parents 68694c6 + 24d9a9a commit 9a73222
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
6 changes: 2 additions & 4 deletions lib/windowsbasetest.pm
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ sub open_powershell_as_admin {
if (get_var('QAM_WINDOWS_SERVER')) {
send_key_until_needlematch 'windows-quick-features-menu', 'super-x';
wait_screen_change { send_key('shift-a') };
# Maximize window
wait_screen_change { send_key('super-up') };
wait_screen_change { assert_and_click('window-max') };
assert_screen 'windows_server_powershell_opened', 30;
} else {
if (check_var('WIN_VERSION', '10')) {
Expand All @@ -79,8 +78,7 @@ sub open_powershell_as_admin {
send_key 'esc' if match_has_tag('powershell-with-startup-menu');
}
assert_screen 'powershell-as-admin-window', timeout => 240;
# Maximize window
send_key 'super-up';
assert_and_click 'window-max';
wait_still_screen stilltime => 3, timeout => 12;
_setup_serial_device unless (exists $args{no_serial});
}
Expand Down
7 changes: 3 additions & 4 deletions tests/wsl/firstrun.pm
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,11 @@ sub run {
assert_screen [qw(yast2-wsl-firstboot-welcome wsl-installing-prompt)], 480;

if (match_has_tag 'yast2-wsl-firstboot-welcome') {

# The new process of installing, appears in an already maximized window,
# but sometimes it loses focus. So I created another needle to check if
# the window is already maximized and click somewhere else to bring it to focus.
assert_screen(['window-max', 'window-minimize']);
send_key 'super-up' if match_has_tag 'window-max';
assert_and_click 'window-max' if match_has_tag 'window-max';
assert_and_click 'window-minimize' if match_has_tag 'window-minimize';
wait_still_screen stilltime => 3, timeout => 10;
is_fake_scc_url_needed && set_fake_scc_url();
Expand Down Expand Up @@ -156,8 +155,8 @@ sub run {
# Back to CLI
assert_screen 'wsl-linux-prompt';
} else {
#1) Make sure to maximize the window and skip registration, we cannot register against proxy SCC
send_key 'super-up';
#1) skip registration, we cannot register against proxy SCC
assert_and_click 'window-max';
assert_screen 'wsl-registration-prompt', 300;
send_key 'ret';

Expand Down

0 comments on commit 9a73222

Please sign in to comment.