srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-21 21:43:08 +00:00
Code Issues Releases Activity

Clean up minimal browser environment setup

Browse Source 
Move the xauth disablement and the disabling of studies into
_setup_browser, instead of repeating it in a couple of other
places (but *not* doing it in the zezere test, where we should
be doing it). Drop some explicit package installs that should
no longer be needed as Firefox and/or X.org now depend on those
things. Install the current default fonts (Noto), not the old
ones (DejaVu).

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-03-02 13:51:08 -08:00
parent 0b2053b842
commit 20620236b3
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cockpit.pm
View File

@ -20,9 +20,6 @@ sub start_cockpit {
$args{login} //= 0; $args{login} //= 0;
$args{admin} //= 1; $args{admin} //= 1;
my $login = shift || 0; my $login = shift || 0;
# https://bugzilla.redhat.com/show_bug.cgi?id=1439429
assert_script_run "sed -i -e 's,enable_xauth=1,enable_xauth=0,g' /usr/bin/startx";
disable_firefox_studies;
# run firefox directly in X as root. never do this, kids! # run firefox directly in X as root. never do this, kids!
type_string "startx /usr/bin/firefox -width 1024 -height 768 http://localhost:9090\n"; type_string "startx /usr/bin/firefox -width 1024 -height 768 http://localhost:9090\n";
assert_screen "cockpit_login", 60; assert_screen "cockpit_login", 60;

3
lib/freeipa.pm
View File

@ -39,9 +39,6 @@ sub start_webui {
my $user_screen = "freeipa_webui_user"; my $user_screen = "freeipa_webui_user";
$user_screen = "freeipa_webui_users" if ($user eq 'admin'); $user_screen = "freeipa_webui_users" if ($user eq 'admin');
# https://bugzilla.redhat.com/show_bug.cgi?id=1439429
assert_script_run "sed -i -e 's,enable_xauth=1,enable_xauth=0,g' /usr/bin/startx";
disable_firefox_studies;
type_string "startx /usr/bin/firefox -width 1024 -height 768 https://ipa001.test.openqa.fedoraproject.org\n"; type_string "startx /usr/bin/firefox -width 1024 -height 768 https://ipa001.test.openqa.fedoraproject.org\n";
assert_screen ["freeipa_webui_login", $user_screen], 60; assert_screen ["freeipa_webui_login", $user_screen], 60;
wait_still_screen(stilltime => 5, similarity_level => 45); wait_still_screen(stilltime => 5, similarity_level => 45);

15
tests/_setup_browser.pm
View File

@ -7,15 +7,14 @@ sub run {
my $self = shift; my $self = shift;
# set up appropriate repositories # set up appropriate repositories
repo_setup(); repo_setup();
# install a desktop and firefox so we can actually try it # install X environment
assert_script_run "dnf -y groupinstall 'base-x'", 300; assert_script_run "dnf -y groupinstall 'base-x'", 300;
# FIXME: this should probably be in base-x...X seems to fail without # install firefox, plus our basic default fonts to try and avoid
assert_script_run "dnf -y install libglvnd-egl", 180; # random weird font selection happening
# try to avoid random weird font selection happening assert_script_run "dnf -y install firefox google-noto-sans-vf-fonts google-noto-sans-mono-vf-fonts google-noto-serif-vf-fonts", 180;
assert_script_run "dnf -y install dejavu-sans-fonts dejavu-sans-mono-fonts dejavu-serif-fonts", 180; # https://bugzilla.redhat.com/show_bug.cgi?id=1439429
# since firefox-85.0-2, firefox doesn't seem to run without this assert_script_run "sed -i -e 's,enable_xauth=1,enable_xauth=0,g' /usr/bin/startx";
assert_script_run "dnf -y install dbus-glib", 180; disable_firefox_studies;
assert_script_run "dnf -y install firefox", 180;
} }
sub test_flags { sub test_flags {