From 3b4d0aa00b744fb3bdec435dbd732017a624087b Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 8 Jun 2021 15:16:54 -0700
Subject: [PATCH] Revert "Prevent the Konqueror test from running on F32 and
 later."

This reverts commit 603ee871c13fe0ed9776e91ee0d36c3caf2837f7. We
are well past F32 at this point so it's not longer needed. Just
wipe the test entirely instead.
---
 main.pm                               | 16 +---------------
 tests/apps_startstop/kde/konqueror.pm | 25 -------------------------
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 tests/apps_startstop/kde/konqueror.pm

diff --git a/main.pm b/main.pm
index e58e69b6..639ed9c5 100644
--- a/main.pm
+++ b/main.pm
@@ -21,7 +21,6 @@ use testapi;
 use autotest;
 use needle;
 use File::Basename;
-use utils;
 
 # distribution-specific implementations of expected methods
 my $distri = testapi::get_var("CASEDIR") . '/lib/fedoradistribution.pm';
@@ -400,23 +399,10 @@ if (get_var("STARTSTOP")) {
 
     # Find all tests from a directory defined by the DESKTOP variable
     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
     foreach my $filepath (@apptests) {
         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') {
         # Run this test to check if required application have registered.
diff --git a/tests/apps_startstop/kde/konqueror.pm b/tests/apps_startstop/kde/konqueror.pm
deleted file mode 100644
index 9ad9e4c2..00000000
--- a/tests/apps_startstop/kde/konqueror.pm
+++ /dev/null
@@ -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: