From 9c6d5459e6e1ddef8dc13d8b85512edf84ca71bb Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 7 Dec 2022 11:26:27 -0800 Subject: [PATCH] Simplify the KDE abrt logic This does the same, just cleaner. Signed-off-by: Adam Williamson --- needles/kde/apps/abrt_runs_found_problem.json | 3 ++- tests/apps_startstop/kde/abrt.pm | 15 ++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/needles/kde/apps/abrt_runs_found_problem.json b/needles/kde/apps/abrt_runs_found_problem.json index 2e9d6da4..7921df96 100644 --- a/needles/kde/apps/abrt_runs_found_problem.json +++ b/needles/kde/apps/abrt_runs_found_problem.json @@ -1,6 +1,7 @@ { "properties": [], "tags": [ + "abrt_runs", "abrt_runs_found_problem" ], "area": [ @@ -12,4 +13,4 @@ "type": "match" } ] -} \ No newline at end of file +} diff --git a/tests/apps_startstop/kde/abrt.pm b/tests/apps_startstop/kde/abrt.pm index 85f5f42d..d6ecf5e1 100644 --- a/tests/apps_startstop/kde/abrt.pm +++ b/tests/apps_startstop/kde/abrt.pm @@ -9,19 +9,8 @@ sub run { my $self = shift; # Start the application menu_launch_type('abrt'); - # Check that the application has started. - # On KDE, the test failed when Abrt started - # and there was an error caught. - # Now, if we do not find the needle that - # checks Abrt has started, we will also - # check for a reported issue - if we find that - # we can assume that Abrt has started indeed. - unless (check_screen('abrt_runs', timeout => 30)) { - # The above check needs some timeout because - # it might take some time before Abrt starts. - assert_screen('abrt_runs_found_problem'); - record_soft_failure("Abrt has reported issues."); - } + assert_screen 'abrt_runs'; + record_soft_failure("Abrt has reported issues") if (match_has_tag 'abrt_runs_found_problem'); # Close the application quit_with_shortcut(); }