From 01ebd22e79d66334e3a6b667286af48ec6c1715b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20Rivera?= Date: Tue, 9 Apr 2019 10:21:32 +0200 Subject: [PATCH] perlcritic: Subroutine called with "&" sigil --- data/s390x/TOOL_s390_ZIOMON/ziomon_basic.pl | 2 +- lib/ipmi_backend_utils.pm | 16 ++++++++-------- tests/virt_autotest/guest_migration_dst.pm | 2 +- tests/virt_autotest/guest_migration_src.pm | 2 +- tests/virt_autotest/virt_utils.pm | 4 ++-- tests/virt_autotest/virt_v2v_src.pm | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/data/s390x/TOOL_s390_ZIOMON/ziomon_basic.pl b/data/s390x/TOOL_s390_ZIOMON/ziomon_basic.pl index 1bfc2b647058..0868d611ee9c 100644 --- a/data/s390x/TOOL_s390_ZIOMON/ziomon_basic.pl +++ b/data/s390x/TOOL_s390_ZIOMON/ziomon_basic.pl @@ -81,7 +81,7 @@ sub reset_and_show_dmesg open my $fh, '>', "temp" or die $!; print $fh `dmesg -c`; close($fh); - &filter_repeated("temp", "|"); + filter_repeated("temp", "|"); unlink "temp"; } sub assert_warn diff --git a/lib/ipmi_backend_utils.pm b/lib/ipmi_backend_utils.pm index 77ed360ebc1e..a2f0a85f40a2 100644 --- a/lib/ipmi_backend_utils.pm +++ b/lib/ipmi_backend_utils.pm @@ -211,9 +211,9 @@ sub set_pxe_efiboot { my $installation_disk = ""; if ($root_prefix ne "/") { - $installation_disk = &get_installation_partition; + $installation_disk = get_installation_partition; assert_script_run("cd /"); - &mount_installation_disk("$installation_disk", "$root_prefix"); + mount_installation_disk("$installation_disk", "$root_prefix"); } my $wait_script = "30"; @@ -275,7 +275,7 @@ sub set_pxe_efiboot { #cleanup mount if ($root_prefix ne "/") { assert_script_run("cd /"); - &umount_installation_disk("$root_prefix"); + umount_installation_disk("$root_prefix"); } } @@ -293,11 +293,11 @@ sub set_serial_console_on_vh { #when mount point is not empty, needs to mount installation disk if ($installation_disk eq "") { #search for the real installation partition on the first disk, which is selected by yast in ipmi installation - $installation_disk = &get_installation_partition; + $installation_disk = get_installation_partition; } #mount partition assert_script_run("cd /"); - &mount_installation_disk("$installation_disk", "$mount_point"); + mount_installation_disk("$installation_disk", "$mount_point"); $root_dir = $mount_point; } else { @@ -305,14 +305,14 @@ sub set_serial_console_on_vh { } #set up xen serial console - my $ipmi_console = &get_dom0_serialdev("$root_dir"); - if (${virt_type} eq "xen" || ${virt_type} eq "kvm") { &setup_console_in_grub($ipmi_console, $root_dir, $virt_type); } + my $ipmi_console = get_dom0_serialdev("$root_dir"); + if (${virt_type} eq "xen" || ${virt_type} eq "kvm") { setup_console_in_grub($ipmi_console, $root_dir, $virt_type); } else { die "Host Hypervisor is not xen or kvm"; } #cleanup mount if ($mount_point ne "") { assert_script_run("cd /"); - &umount_installation_disk("$mount_point"); + umount_installation_disk("$mount_point"); } } diff --git a/tests/virt_autotest/guest_migration_dst.pm b/tests/virt_autotest/guest_migration_dst.pm index ab0331361bfa..c9a663e9e64f 100644 --- a/tests/virt_autotest/guest_migration_dst.pm +++ b/tests/virt_autotest/guest_migration_dst.pm @@ -50,7 +50,7 @@ sub run { $self->workaround_for_reverse_lock("SRC_TEST_DONE", $src_test_timeout); script_run("xl dmesg > /tmp/xl-dmesg.log"); my $logs = "/var/log/libvirt /var/log/messages /var/log/xen /var/lib/xen/dump /tmp/xl-dmesg.log"; - &virt_autotest_base::upload_virt_logs($logs, "guest-migration-dst-logs"); + virt_autotest_base::upload_virt_logs($logs, "guest-migration-dst-logs"); #mark dst upload log done mutex_create('DST_UPLOAD_LOG_DONE'); diff --git a/tests/virt_autotest/guest_migration_src.pm b/tests/virt_autotest/guest_migration_src.pm index 3d993ca233e2..83f1d64fa23b 100644 --- a/tests/virt_autotest/guest_migration_src.pm +++ b/tests/virt_autotest/guest_migration_src.pm @@ -100,7 +100,7 @@ sub run { #display test result my $cmd = "cd /tmp; zcat $upload_log_name.tar.gz | sed -n '/Executing check validation/,/[0-9]* fail [0-9]* succeed/p'"; - my $guest_migrate_log_content = &script_output("$cmd"); + my $guest_migrate_log_content = script_output("$cmd"); save_screenshot; #upload junit log diff --git a/tests/virt_autotest/virt_utils.pm b/tests/virt_autotest/virt_utils.pm index a7ff84b8a2ba..4d3f5c31477d 100644 --- a/tests/virt_autotest/virt_utils.pm +++ b/tests/virt_autotest/virt_utils.pm @@ -50,7 +50,7 @@ sub repl_repo_in_sourcefile { if (get_var("REPO_0")) { my $location = ''; if (!check_var('ARCH', 's390x')) { - $location = &virt_autotest_base::execute_script_run("", "perl /usr/share/qa/tools/location_detect_impl.pl", 60); + $location = virt_autotest_base::execute_script_run("", "perl /usr/share/qa/tools/location_detect_impl.pl", 60); $location =~ s/[\r\n]+$//; } else { @@ -131,7 +131,7 @@ sub repl_guest_autoyast_addon_with_daily_build_module { my $version = get_version_for_daily_build_guest; $version =~ s/-/\//; my $autoyast_root_dir = "/usr/share/qa/virtautolib/data/autoinstallation/sles/" . $version . "/"; - my $file_list = &script_output("find $autoyast_root_dir -type f"); + my $file_list = script_output("find $autoyast_root_dir -type f"); repl_addon_with_daily_build_module_in_files("$file_list"); } diff --git a/tests/virt_autotest/virt_v2v_src.pm b/tests/virt_autotest/virt_v2v_src.pm index d386b6bb6718..08582dbad312 100644 --- a/tests/virt_autotest/virt_v2v_src.pm +++ b/tests/virt_autotest/virt_v2v_src.pm @@ -34,7 +34,7 @@ sub run { wait_for_children; script_run("xl dmesg > /tmp/xl-dmesg.log"); - &virt_autotest_base::upload_virt_logs("/var/log/libvirt /var/log/messages /var/log/xen /var/lib/xen/dump /tmp/xl-dmesg.log", "virt-v2v-xen-src-logs"); + virt_autotest_base::upload_virt_logs("/var/log/libvirt /var/log/messages /var/log/xen /var/lib/xen/dump /tmp/xl-dmesg.log", "virt-v2v-xen-src-logs"); } 1;