testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

desktop_login: don't use solidify_wallpaper, use a hack instead

Browse Source 
solidify_wallpaper only does the current session, and does it in
a kind of painful way on each desktop. For apps_startstop this
is kinda okay, but for desktop_login it's slow and error-prone
to do this three times, every time. Let's replace it with a hack
that just replaces the actual wallpaper files with a solid black
PNG file. This only takes effect after a logout, but it should
affect all logins on all desktops once it's done. So long as
the base backgrounds package doesn't change layout too much.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-11-12 13:08:20 -08:00
parent fc0698ca1c
commit 8106286a43
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/desktop_login.pm
View File

@ -191,15 +191,16 @@ sub run {
my $jackpass = "kozapanijezibaby"; my $jackpass = "kozapanijezibaby";
my $jimpass = "babajagakozaroza"; my $jimpass = "babajagakozaroza";
our $desktop = get_var("DESKTOP"); our $desktop = get_var("DESKTOP");
# Get rid of the KDE wallpaper and make background black. # replace the wallpaper with a black image, this should work for
# all desktops. Takes effect after a logout / login cycle
$self->root_console(tty=>3);
assert_script_run "dnf -y install GraphicsMagick", 300;
assert_script_run "gm convert -size 1024x768 xc:black /usr/share/backgrounds/black.png";
assert_script_run 'for i in /usr/share/backgrounds/f*/default/*.png; do ln -sf /usr/share/backgrounds/black.png $i; done';
if ($desktop eq "kde") { if ($desktop eq "kde") {
solidify_wallpaper; # use solid blue background for SDDM
# also get rid of the wallpaper on SDDM screen. This is system
# wide so we only need do it once
$self->root_console(tty=>3);
assert_script_run "sed -i -e 's,image,solid,g' /usr/share/sddm/themes/01-breeze-fedora/theme.conf.user"; assert_script_run "sed -i -e 's,image,solid,g' /usr/share/sddm/themes/01-breeze-fedora/theme.conf.user";
} }
$self->root_console(tty=>3);
adduser(name=>"Jack Sparrow", login=>"jack", password=>$jackpass, termstop=>0); adduser(name=>"Jack Sparrow", login=>"jack", password=>$jackpass, termstop=>0);
if ($desktop eq "gnome") { if ($desktop eq "gnome") {
# In Gnome, we can create a passwordless user that can provide his password upon # In Gnome, we can create a passwordless user that can provide his password upon
@ -223,9 +224,6 @@ sub run {
# Log in with the first user account. # Log in with the first user account.
login_user(user=>"jack", password=>$jackpass); login_user(user=>"jack", password=>$jackpass);
# Because some of the desktop candiness is based on semi-transparent items that change colours
# with every background change, we want to get rid of the background and make it a solid color.
solidify_wallpaper;
check_user_logged_in("jack"); check_user_logged_in("jack");
# Log out the user. # Log out the user.
logout_user(); logout_user();
@ -239,8 +237,6 @@ sub run {
# If not, we are in KDE and we will log in normally. # If not, we are in KDE and we will log in normally.
login_user(user=>"jim", password=>$jimpass); login_user(user=>"jim", password=>$jimpass);
} }
# The backgrounds must be solid for both newly created users to take effect in the login session.
solidify_wallpaper;
check_user_logged_in("jim"); check_user_logged_in("jim");
# And this time reboot the system using the menu. # And this time reboot the system using the menu.
reboot_system(); reboot_system();