From 6807b54a64391eb47bceee73e1aab442cf7c12a5 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 21 Jun 2021 17:10:35 -0700 Subject: [PATCH] Need to double click anaconda launcher with kde-settings 34.6 KDE has made it so you need to double-click icons on the desktop now. Unfortunately this means a clunky conditional at least until the update goes stable. When F33 is EOL we can reduce it to just "if kde". Signed-off-by: Adam Williamson --- tests/_boot_to_anaconda.pm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm index 4c42c4c1..62152542 100644 --- a/tests/_boot_to_anaconda.pm +++ b/tests/_boot_to_anaconda.pm @@ -115,11 +115,19 @@ sub run { if (get_var('LIVE')) { assert_screen ["live_start_anaconda_icon", "apps_menu_button_active"], 300; send_key "alt-f1" if match_has_tag "apps_menu_button_active"; - assert_and_click("live_start_anaconda_icon"); + # for KDE we need to double-click after kde-settings-34.6-1, + # which is in FEDORA-2021-dcc1ce9423 + # FIXME: when that update goes stable, simplify the dclick + # conditional to just desktop eq KDE && relnum > 33 + my $advortask = get_var("ADVISORY_OR_TASK"); + my $relnum = get_release_number; + my $dclick = 0; + $dclick = 1 if (get_var("DESKTOP") eq "kde" && ($relnum > 34 || $advortask eq "FEDORA-2021-dcc1ce9423")); + assert_and_click("live_start_anaconda_icon", dclick=>$dclick); unless (check_screen "anaconda_select_install_lang", 180) { # click it again - on KDE since 2019-10 or so it seems # like the first attempt sometimes just doesn't work - assert_and_click("live_start_anaconda_icon", timeout=>300); + assert_and_click("live_start_anaconda_icon", dclick=>$dclick, timeout=>300); } } my $language = get_var('LANGUAGE') || 'english';