#155 Prevent the Konqueror test from running on F32 and later.
Merged 4 years ago by adamwill. Opened 4 years ago by lruzicka.

file modified
+15 -1
@@ -21,6 +21,7 @@ 

  use autotest;

  use needle;

  use File::Basename;

+ use utils;

  

  # distribution-specific implementations of expected methods

  my $distri = testapi::get_var("CASEDIR") . '/lib/fedoradistribution.pm';
@@ -393,10 +394,23 @@ 

  

      # 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);

-         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') {

          # Run this test to check if required application have registered.

@@ -7,7 +7,6 @@ 

  

  sub run {

      my $self = shift;

-     

      # Start the application

      menu_launch_type 'konqueror';

      # Check that it is started

So this is the most up-to-date attempt to block Konqueror from running. It has been tested on Staging and works just fine.

rebased onto cb55472e8b146830dcc22f34599ce0c1366e8c42

4 years ago

Build succeeded.

We have a convenience function in utils.pm for the 'Rawhide as a number' thing - get_release_number. Can you please tweak this to use that?

Also, I think it might be cleaner to do this as a filter on the module loading, in main.pm, rather than causing the module to load but effectively be a no-op. This way it looks like we tested konqueror and it passed, which is slightly misleading.

rebased onto dcdff0249799ef9db2055b7741bc064b9f6eb6b0

4 years ago

Build succeeded.

1 new commit added

  • Rework changes after the review.
4 years ago

Build succeeded.

1 new commit added

  • Import subroutine.
4 years ago

3 new commits added

  • Add use.
  • Rework changes after the review.
  • Prevent the Konqueror test from running on F32 and later.
4 years ago

Build succeeded.

1 new commit added

  • Add print to see more info.
4 years ago

Build succeeded.

1 new commit added

  • Make further prints to see the values.
4 years ago

Build succeeded.

1 new commit added

  • Fix the comparison and delete prints.
4 years ago

Build succeeded.

rebased onto 603ee87

4 years ago

I moved the decision to the main.pm and now the Konqueror test is not showing for 32. However, I did not find any living tests in Updates that would run Application StartStop for KDE. So, maybe it would have been enough to just remove the test file.

Build succeeded.

"However, I did not find any living tests in Updates that would run Application StartStop for KDE."

It's not the regular updates tests, it's the rare "respin" tests which only happen when southern_gentleman sends out a set of respins. Here's the last time that test ran.

The respins are always done for the current stable release, so once F32 is stable, we can just drop the konqueror test entirely.

Pull-Request has been merged by adamwill

4 years ago