From 6232be32cfb8bef52cc6cce8f0181deab2dde4c2 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 8 Jul 2020 17:09:45 -0700 Subject: [PATCH] Sigh, move menu_launch_type after get_release_number Stupid perl. Signed-off-by: Adam Williamson --- lib/utils.pm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index 07adf5a1..dcff4cce 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -381,24 +381,6 @@ sub check_release { validate_script_output $check_command, sub { $_ =~ m/REDHAT_SUPPORT_PRODUCT_VERSION=$release/ }; } -sub menu_launch_type { - # Launch an application in a graphical environment, by opening a - # launcher, typing the specified string and hitting enter. Pass - # the string to be typed to launch whatever it is you want. - my $app = shift; - # super does not work on KDE, because fml - send_key 'alt-f1'; - # srsly KDE y u so slo - wait_still_screen 3; - my $relnum = get_release_number; - if (get_var("DESKTOP") eq "gnome" && $relnum > 32) { - # FIXME: workaround https://pagure.io/background-logo-extension/issue/26 - assert_and_click "overview_search_box"; - } - type_very_safely $app; - send_key 'ret'; -} - sub disable_firefox_studies { # create a config file that disables Firefox's dumb 'shield # studies' so they don't break tests: @@ -1029,6 +1011,24 @@ sub get_release_number { return $version } +sub menu_launch_type { + # Launch an application in a graphical environment, by opening a + # launcher, typing the specified string and hitting enter. Pass + # the string to be typed to launch whatever it is you want. + my $app = shift; + # super does not work on KDE, because fml + send_key 'alt-f1'; + # srsly KDE y u so slo + wait_still_screen 3; + my $relnum = get_release_number; + if (get_var("DESKTOP") eq "gnome" && $relnum > 32) { + # FIXME: workaround https://pagure.io/background-logo-extension/issue/26 + assert_and_click "overview_search_box"; + } + type_very_safely $app; + send_key 'ret'; +} + sub tell_source { # This helper function identifies the Subvariant of the tested system. # For the purposes of identification testing, we are only interested