From 5e03c5aecd867fd0e48c0b238365a059071781c2 Mon Sep 17 00:00:00 2001
From: Lukas Ruzicka <lruzicka@redhat.com>
Date: Wed, 22 Mar 2023 12:31:48 +0100
Subject: [PATCH] Restructure stuff a bit.

---
 tests/applications/software/install_rpm.pm                 | 7 ++-----
 .../{install_multi_rpm.pm => install_rpm_multi.pm}         | 3 +++
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename tests/applications/software/{install_multi_rpm.pm => install_rpm_multi.pm} (94%)

diff --git a/tests/applications/software/install_rpm.pm b/tests/applications/software/install_rpm.pm
index 32fe5e3e..1fe98354 100644
--- a/tests/applications/software/install_rpm.pm
+++ b/tests/applications/software/install_rpm.pm
@@ -18,12 +18,9 @@ sub run {
     my $self = shift;
 
     unless (get_var("SUBVARIANT") eq "Silverblue") {
-        # Sometimes, after rollback, Software crashes. If it
-        # happens, let's restart it.
-        unless (check_screen("apps_run_software")) {
-            restart_application("software");
-        }
 
+        # Find the application.
+        find_application("mahjongg");
         # Install the application.
         install_application("mahjongg", "rpm");
         wait_still_screen(10);
diff --git a/tests/applications/software/install_multi_rpm.pm b/tests/applications/software/install_rpm_multi.pm
similarity index 94%
rename from tests/applications/software/install_multi_rpm.pm
rename to tests/applications/software/install_rpm_multi.pm
index df75c6c8..d6e7b4ab 100644
--- a/tests/applications/software/install_multi_rpm.pm
+++ b/tests/applications/software/install_rpm_multi.pm
@@ -24,8 +24,11 @@ sub run {
             restart_application("software");
         }
         # Perform all installations one after another.
+        find_application("mahjongg")
         install_application("mahjongg", "rpm");
+        find_application("gvim");
         install_application("gvim", "rpm");
+        find_application("emacs");
         install_application("emacs", "rpm");
 
         # Check that the installations have completed successfully.