From 4e3a2842200f0229ccceaa1bde2fea66b2c37e73 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 24 Oct 2023 08:21:51 -0700 Subject: [PATCH] krfb: handle two cancel buttons In today's Rawhide, two dialogs have to be cancelled on krfb launch before we see the UI: a remote control permission screen and a kwallet creation flow. Signed-off-by: Adam Williamson --- tests/apps_startstop/kde/krfb.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/apps_startstop/kde/krfb.pm b/tests/apps_startstop/kde/krfb.pm index 542c977f..1dfa427f 100644 --- a/tests/apps_startstop/kde/krfb.pm +++ b/tests/apps_startstop/kde/krfb.pm @@ -12,9 +12,15 @@ sub run { menu_launch_type 'krfb'; # Check that it is started assert_screen ['krfb_runs', 'kde_cancel_button'], timeout => 60; + # we may see *two* cancel buttons - one for remote control + # permissions, one for kwallet if (match_has_tag 'kde_cancel_button') { click_lastmatch; - assert_screen 'krfb_runs'; + assert_screen ['krfb_runs', 'kde_cancel_button']; + if (match_has_tag 'kde_cancel_button') { + click_lastmatch; + assert_screen 'krfb_runs'; + } } wait_still_screen(3); # close the "remote control requested" window if shown