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

Firefox_nss: Revert unnecessary x11utils::turn_off_gnome_screensaver call #7874

Merged
merged 1 commit into from Jul 16, 2019
Merged

Firefox_nss: Revert unnecessary x11utils::turn_off_gnome_screensaver call #7874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/main_common.pm
View file
Open in desktop
Expand Up @@ -2126,14 +2126,14 @@ sub load_security_tests_crypt_x11 {
set_var('SECTEST_REQUIRE_WE', 1);
load_security_console_prepare;

loadtest "fips/mozilla_nss/firefox_nss" if get_var('FIPS_ENABLED');
# In SLE, hexchat and seahorse are provided only in WE addon which is for
# x86_64 platform only.
if (is_x86_64) {
loadtest "x11/seahorse_sshkey";
loadtest "x11/hexchat_ssl";
}
loadtest "x11/x3270_ssl";
loadtest "fips/mozilla_nss/firefox_nss" if get_var('FIPS_ENABLED');
}

sub load_security_tests_crypt_tool {
Expand Down
7 changes: 3 additions & 4 deletions tests/fips/mozilla_nss/firefox_nss.pm
View file
Open in desktop
Expand Up @@ -18,7 +18,6 @@ use base "x11test";
use strict;
use warnings;
use testapi;
use x11utils 'turn_off_gnome_screensaver';

sub quit_firefox {
send_key "alt-f4";
Expand All @@ -28,16 +27,16 @@ sub quit_firefox {
}

sub run {
my ($self) = shift;
my ($self) = @_;
select_console 'root-console';

# Define FIPS password for firefox, and it should be consisted by:
# - at least 8 characters
# - at least one upper case
# - at least one non-alphabet-non-number character (like: @-.=%)
my $fips_password = 'openqa@SUSE';

# Turn off screensaver before launch firefox in order to avoid the screensaver block
turn_off_gnome_screensaver if check_var('DESKTOP', 'gnome');
jouyingbin marked this conversation as resolved.
Show resolved Hide resolved
select_console 'x11';
x11_start_program('firefox https://html5test.opensuse.org', target_match => 'firefox-html-test', match_timeout => 360);

# Firfox Preferences
Expand Down