mirror of
https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
synced 2024-11-22 05:53:09 +00:00
Revert "Prevent the Konqueror test from running on F32 and later."
This reverts commit 603ee871c1
. We
are well past F32 at this point so it's not longer needed. Just
wipe the test entirely instead.
This commit is contained in:
parent
59fbfcaa91
commit
3b4d0aa00b
14
main.pm
14
main.pm
@ -21,7 +21,6 @@ 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';
|
||||||
@ -400,24 +399,11 @@ 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,25 +0,0 @@
|
|||||||
use base "installedtest";
|
|
||||||
use strict;
|
|
||||||
use testapi;
|
|
||||||
use utils;
|
|
||||||
|
|
||||||
# This test checks that Konqueror starts.
|
|
||||||
|
|
||||||
sub run {
|
|
||||||
my $self = shift;
|
|
||||||
# Start the application
|
|
||||||
menu_launch_type 'konqueror';
|
|
||||||
# Check that it is started
|
|
||||||
assert_screen 'konqueror_runs';
|
|
||||||
# Close the application
|
|
||||||
quit_with_shortcut();
|
|
||||||
}
|
|
||||||
|
|
||||||
sub test_flags {
|
|
||||||
return {always_rollback => 1};
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
1;
|
|
||||||
|
|
||||||
# vim: set sw=4 et:
|
|
Loading…
Reference in New Issue
Block a user