testing/os-autoinst-distri-rocky
11
0
Fork 0
mirror of https://github.com/rocky-linux/os-autoinst-distri-rocky.git synced 2024-11-22 05:01:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent the Konqueror test from running on F32 and later.

Browse Source 
Rework changes after the review.
This commit is contained in:
Lukáš Růžička 2020-03-31 09:37:11 +02:00
parent 36181eea76
commit 603ee871c1
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main.pm
View File

@ -21,6 +21,7 @@ use testapi;
use autotest; use autotest;
use needle; use needle;
use File::Basename; use File::Basename;
use utils;
# distribution-specific implementations of expected methods # distribution-specific implementations of expected methods
my $distri = testapi::get_var("CASEDIR") . '/lib/fedoradistribution.pm'; my $distri = testapi::get_var("CASEDIR") . '/lib/fedoradistribution.pm';
@ -393,11 +394,24 @@ if (get_var("STARTSTOP")) {
# Find all tests from a directory defined by the DESKTOP variable # Find all tests from a directory defined by the DESKTOP variable
my @apptests = glob "${casedir}/tests/apps_startstop/${desktop}/*.pm"; my @apptests = glob "${casedir}/tests/apps_startstop/${desktop}/*.pm";
# We need to know the release number in order to make a decision based
# on the version - see later.
my $release = utils::get_release_number();
# Now load them # Now load them
foreach my $filepath (@apptests) { foreach my $filepath (@apptests) {
my $file = basename($filepath); my $file = basename($filepath);
# Konqueror has been removed from default installed applications and
# its test was constantly failing. The following will only run the
# Konqueror tests when the version is less than 32. Other tests
# should stay unaffected by this change.
# FIXME: Revert this change when we are done testing older versions.
if (($file eq "konqueror.pm") and ($release >= 32)) {
print "\nSkipping the Konqueror test in this version.\n";
}
else {
autotest::loadtest "tests/apps_startstop/${desktop}/${file}"; autotest::loadtest "tests/apps_startstop/${desktop}/${file}";
} }
}
if ($desktop eq 'gnome') { if ($desktop eq 'gnome') {
# Run this test to check if required application have registered. # Run this test to check if required application have registered.
autotest::loadtest "tests/workstation_core_applications.pm"; autotest::loadtest "tests/workstation_core_applications.pm";

1
tests/apps_startstop/kde/konqueror.pm
View File

@ -7,7 +7,6 @@ use utils;
sub run { sub run {
my $self = shift; my $self = shift;
# Start the application # Start the application
menu_launch_type 'konqueror'; menu_launch_type 'konqueror';
# Check that it is started # Check that it is started