From c9609cf26d5913ae486c9a70ea137ee96836f34e Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 3 May 2021 11:42:57 -0700 Subject: [PATCH] Drop bypass_1691487 function and usage (bug seems fixed) Per https://bugzilla.redhat.com/show_bug.cgi?id=1691487#c14 it seems like the bug here got fixed along the way and we probably don't need this any more. Signed-off-by: Adam Williamson --- lib/utils.pm | 9 +-------- tests/_podman_client.pm | 1 - tests/_post_network_static.pm | 1 - tests/_setup_browser.pm | 1 - tests/autocloud.pm | 1 - tests/base_reboot_unmount.pm | 1 - tests/base_selinux.pm | 1 - tests/btrfs_preserve_home_check_content.pm | 1 - tests/fedora_release.pm | 1 - tests/podman.pm | 1 - tests/realmd_join_cockpit.pm | 1 - tests/realmd_join_sssd.pm | 1 - tests/server_cockpit_autoupdate.pm | 1 - tests/server_cockpit_basic.pm | 1 - tests/server_cockpit_updates.pm | 1 - tests/server_filesystem_default.pm | 1 - tests/unwanted_packages.pm | 1 - 17 files changed, 1 insertion(+), 24 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index b582b82e..e3ce3596 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -7,7 +7,7 @@ use Exporter; use lockapi; use testapi; -our @EXPORT = qw/run_with_error_check type_safely type_very_safely desktop_vt boot_to_login_screen console_login console_switch_layout desktop_switch_layout console_loadkeys_us do_bootloader boot_decrypt check_release menu_launch_type repo_setup setup_workaround_repo cleanup_workaround_repo console_initial_setup handle_welcome_screen gnome_initial_setup anaconda_create_user check_desktop download_modularity_tests quit_firefox advisory_get_installed_packages advisory_check_nonmatching_packages start_with_launcher quit_with_shortcut lo_dismiss_tip disable_firefox_studies select_rescue_mode copy_devcdrom_as_isofile bypass_1691487 get_release_number check_left_bar check_top_bar check_prerelease check_version spell_version_number _assert_and_click is_branched rec_log click_unwanted_notifications repos_mirrorlist register_application get_registered_applications solidify_wallpaper/; +our @EXPORT = qw/run_with_error_check type_safely type_very_safely desktop_vt boot_to_login_screen console_login console_switch_layout desktop_switch_layout console_loadkeys_us do_bootloader boot_decrypt check_release menu_launch_type repo_setup setup_workaround_repo cleanup_workaround_repo console_initial_setup handle_welcome_screen gnome_initial_setup anaconda_create_user check_desktop download_modularity_tests quit_firefox advisory_get_installed_packages advisory_check_nonmatching_packages start_with_launcher quit_with_shortcut lo_dismiss_tip disable_firefox_studies select_rescue_mode copy_devcdrom_as_isofile get_release_number check_left_bar check_top_bar check_prerelease check_version spell_version_number _assert_and_click is_branched rec_log click_unwanted_notifications repos_mirrorlist register_application get_registered_applications solidify_wallpaper/; # We introduce this global variable to hold the list of applications that have # registered during the apps_startstop_test when they have sucessfully run. @@ -1125,13 +1125,6 @@ EOF assert_script_run($_) foreach (split /\n/, $cmd); } -sub bypass_1691487 { - if (script_run 'echo "expected command supposed to be typed without error."') { - record_soft_failure 'brc#1691487 bypass'; - script_run 'echo "trial bypass dup chars brc#1691487"'; - } -} - sub menu_launch_type { # Launch an application in a graphical environment, by opening a # launcher, typing the specified string and hitting enter. Pass diff --git a/tests/_podman_client.pm b/tests/_podman_client.pm index 24526d4b..88f6e493 100644 --- a/tests/_podman_client.pm +++ b/tests/_podman_client.pm @@ -8,7 +8,6 @@ use utils; sub run { my $self = shift; - bypass_1691487 unless (get_var("DESKTOP")); $self->root_console(tty=>3); # wait for server to be set up mutex_lock "podman_server_ready"; diff --git a/tests/_post_network_static.pm b/tests/_post_network_static.pm index 387d201a..8213e227 100644 --- a/tests/_post_network_static.pm +++ b/tests/_post_network_static.pm @@ -8,7 +8,6 @@ sub run { my $self = shift; my ($ip, $hostname) = split(/ /, get_var("POST_STATIC")); $hostname //= 'localhost.localdomain'; - bypass_1691487; # set up networking setup_tap_static($ip, $hostname); } diff --git a/tests/_setup_browser.pm b/tests/_setup_browser.pm index 91674a74..9fdef5ed 100644 --- a/tests/_setup_browser.pm +++ b/tests/_setup_browser.pm @@ -5,7 +5,6 @@ use utils; sub run { my $self = shift; - bypass_1691487; # set up appropriate repositories repo_setup(); # use --enablerepo=fedora for Modular compose testing (we need to diff --git a/tests/autocloud.pm b/tests/autocloud.pm index d17e1975..22a90ebf 100644 --- a/tests/autocloud.pm +++ b/tests/autocloud.pm @@ -19,7 +19,6 @@ sub run { # autocloud used to use, via tunir and this tunir config: # https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/roles/autocloud/backend/files/fedora.txt?id=6e7c1b90593df8371fd34ed9484bd4da119236d3 my $self = shift; - bypass_1691487; # we need to use script_run as regular user assert_script_run "chmod ugo+w /dev/" . $serialdev; # let's go to another tty and login as regular user diff --git a/tests/base_reboot_unmount.pm b/tests/base_reboot_unmount.pm index fe8e74f1..47492d47 100644 --- a/tests/base_reboot_unmount.pm +++ b/tests/base_reboot_unmount.pm @@ -18,7 +18,6 @@ sub test_routine { sub run { my $self = shift; - bypass_1691487 unless (get_var("DESKTOP")); # switch to TTY3 for both graphical and console tests $self->root_console(tty=>3); # Run test for the first time diff --git a/tests/base_selinux.pm b/tests/base_selinux.pm index c902a317..4364bb13 100644 --- a/tests/base_selinux.pm +++ b/tests/base_selinux.pm @@ -5,7 +5,6 @@ use utils; sub run { my $self=shift; - bypass_1691487 unless (get_var("DESKTOP")); # switch to TTY3 for both, graphical and console tests $self->root_console(tty=>3); validate_script_output 'getenforce', sub { $_ =~ m/Enforcing/ }; diff --git a/tests/btrfs_preserve_home_check_content.pm b/tests/btrfs_preserve_home_check_content.pm index 352fde60..72c94334 100644 --- a/tests/btrfs_preserve_home_check_content.pm +++ b/tests/btrfs_preserve_home_check_content.pm @@ -5,7 +5,6 @@ use utils; sub run { my $self=shift; - bypass_1691487 unless (get_var("DESKTOP")); # switch to TTY3 for both, graphical and console tests $self->root_console(tty=>3); # The pre-created image has a special file left in the home diff --git a/tests/fedora_release.pm b/tests/fedora_release.pm index eec7a746..bf700abb 100644 --- a/tests/fedora_release.pm +++ b/tests/fedora_release.pm @@ -24,7 +24,6 @@ sub run { $expectver = $rawrel if ($expectver eq "Rawhide"); # Create a spelt form of the version number. my $speltnum = spell_version_number($tospell); - bypass_1691487; # Create the expected content of the release file # and compare it with its real counterpart. my $expected = "Fedora release $expectver ($speltnum)"; diff --git a/tests/podman.pm b/tests/podman.pm index c22f3d43..f612e435 100644 --- a/tests/podman.pm +++ b/tests/podman.pm @@ -8,7 +8,6 @@ use utils; sub run { my $self = shift; - bypass_1691487 unless (get_var("DESKTOP")); $self->root_console(tty=>3); # check podman is installed assert_script_run "rpm -q podman"; diff --git a/tests/realmd_join_cockpit.pm b/tests/realmd_join_cockpit.pm index 7a9fff10..6b4f7051 100644 --- a/tests/realmd_join_cockpit.pm +++ b/tests/realmd_join_cockpit.pm @@ -9,7 +9,6 @@ use cockpit; sub run { my $self = shift; # use FreeIPA server as DNS server - bypass_1691487; assert_script_run "printf 'search test.openqa.fedoraproject.org\nnameserver 172.16.2.100' > /etc/resolv.conf"; # this gets us the name of the first connection in the list, # which should be what we want diff --git a/tests/realmd_join_sssd.pm b/tests/realmd_join_sssd.pm index 936f96d3..e6c6b615 100644 --- a/tests/realmd_join_sssd.pm +++ b/tests/realmd_join_sssd.pm @@ -21,7 +21,6 @@ sub run { $server_ip = '172.16.2.107'; $server_mutex = 'replica_ready'; } - bypass_1691487; # this gets us the name of the first connection in the list, # which should be what we want my $connection = script_output "nmcli --fields NAME con show | head -2 | tail -1"; diff --git a/tests/server_cockpit_autoupdate.pm b/tests/server_cockpit_autoupdate.pm index 539674fd..3ea3cfb4 100644 --- a/tests/server_cockpit_autoupdate.pm +++ b/tests/server_cockpit_autoupdate.pm @@ -7,7 +7,6 @@ use cockpit; sub run { my $self=shift; - bypass_1691487; # Start Cockpit start_cockpit(1); diff --git a/tests/server_cockpit_basic.pm b/tests/server_cockpit_basic.pm index 7c089e7e..3db6f021 100644 --- a/tests/server_cockpit_basic.pm +++ b/tests/server_cockpit_basic.pm @@ -6,7 +6,6 @@ use cockpit; sub run { my $self=shift; - bypass_1691487; # run firefox and login to cockpit start_cockpit(1); # go to the logs screen diff --git a/tests/server_cockpit_updates.pm b/tests/server_cockpit_updates.pm index 34254b57..243fe61a 100644 --- a/tests/server_cockpit_updates.pm +++ b/tests/server_cockpit_updates.pm @@ -7,7 +7,6 @@ use cockpit; sub run { my $self=shift; - bypass_1691487; my $cockdate = "0"; # Remove a package, disable repositories and enable test repositories, install the package diff --git a/tests/server_filesystem_default.pm b/tests/server_filesystem_default.pm index 0812deb1..dd8eb170 100644 --- a/tests/server_filesystem_default.pm +++ b/tests/server_filesystem_default.pm @@ -5,7 +5,6 @@ use utils; sub run { my $self = shift; - bypass_1691487; # check / is xfs, as it should be on server assert_script_run 'findmnt -M / -o FSTYPE | grep xfs'; } diff --git a/tests/unwanted_packages.pm b/tests/unwanted_packages.pm index b84c40f8..2c258798 100644 --- a/tests/unwanted_packages.pm +++ b/tests/unwanted_packages.pm @@ -5,7 +5,6 @@ use utils; sub run { my $self = shift; - bypass_1691487 unless (get_var("DESKTOP")); # switch to TTY3 for both, graphical and console tests $self->root_console(tty=>3); my @unwanteds;