Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix gnome login for gnome-3.34 upgrade in SLE #9021

Merged
merged 2 commits into from Nov 28, 2019
Merged

Fix gnome login for gnome-3.34 upgrade in SLE #9021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46a5f96
Fix different handling for gdm password depending on product version
okurz Nov 28, 2019
d9ba2b9
Add workaround for additional polkit authentication windows in SLE gn…
okurz Nov 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/opensusebasetest.pm
View file
Open in desktop
Expand Up @@ -788,7 +788,7 @@ sub wait_boot {
#assert_screen "dm-password-input", 10;
elsif (check_var('DESKTOP', 'gnome')) {
# In GNOME/gdm, we do not have to enter a username, but we have to select it
if (is_tumbleweed) {
unless (is_sle('<=15-sp1') || is_leap('<=15.1')) {
send_key 'tab';
}
send_key 'ret';
Expand Down
17 changes: 16 additions & 1 deletion tests/installation/first_boot.pm
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@ use base 'bootbasetest';
use testapi;
use utils 'handle_emergency';
use version_utils qw(is_sle is_leap is_desktop_installed is_upgrade is_sles4sap);
use x11utils 'handle_login';
use x11utils qw(ensure_unlocked_desktop handle_login);
use main_common 'opensuse_welcome_applicable';

sub run {
Expand Down Expand Up @@ -70,6 +70,11 @@ sub run {
if (!is_sle('<=15') && !is_leap('<=15.0') && check_var('ARCH', 'aarch64') && check_var('DESKTOP', 'gnome')) {
push(@tags, 'displaymanager');
}
# bsc#1157928 - deal with additional polkit windows
if (is_sle && !is_sle('<=15-SP1')) {
push(@tags, 'authentication-required-user-settings');
}

# GNOME and KDE get into screenlock after 5 minutes without activities.
# using multiple check intervals here then we can get the wrong desktop
# screenshot at least in case desktop screenshot changed, otherwise we get
Expand All @@ -94,6 +99,16 @@ sub run {
script_sudo('sed -i s/#WaylandEnable=false/WaylandEnable=false/ /etc/gdm/custom.conf');
wait_screen_change { send_key 'alt-f4' };
}
if (match_has_tag('authentication-required-user-settings')) {
record_soft_failure 'bsc#1157928 - deal with additional polkit windows';
wait_still_screen(3);
ensure_unlocked_desktop;
# deal with potential followup authentication window which is not
# actually a login screen but polkit asking for modification to system
# repositories
wait_still_screen(3);
ensure_unlocked_desktop;
}
}

sub test_flags {
Expand Down