mirror of
https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
synced 2024-11-25 07:13:09 +00:00
Prevent the Konqueror test from running on F32 and later.
Rework changes after the review.
This commit is contained in:
parent
36181eea76
commit
603ee871c1
16
main.pm
16
main.pm
@ -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,10 +394,23 @@ 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);
|
||||||
autotest::loadtest "tests/apps_startstop/${desktop}/${file}";
|
# 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}";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
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.
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user