From 79621d45ddcee4a48ad4501840491f162a579a2c Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Thu, 30 Jun 2022 18:12:44 -0700 Subject: [PATCH] fixup whitespace --- tests/os_release.pm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/tests/os_release.pm b/tests/os_release.pm index c4acf034..b675b353 100644 --- a/tests/os_release.pm +++ b/tests/os_release.pm @@ -39,18 +39,18 @@ sub run { # $NAME is "Rocky Linux" not just "Rocky" my $fullname = $name . " Linux"; - my $version_id = get_var("VERSION"); # Should be the version number. - my ($ver_major, $ver_minor) = split /\./, $version_id; - my $varstr = spell_version_number($version_id); - my $target = lc($ver_major); + my $version_id = get_var("VERSION"); # Should be the version number. + my ($ver_major, $ver_minor) = split /\./, $version_id; + my $varstr = spell_version_number($version_id); + my $target = lc($ver_major); - my $reltag = script_output 'rpm -q rocky-release --qf "%{RELEASE}\n"'; - my ($relver, $eltag) = split /\./, $reltag; + my $reltag = script_output 'rpm -q rocky-release --qf "%{RELEASE}\n"'; + my ($relver, $eltag) = split /\./, $reltag; - my $code_name = get_var("CODENAME", 'Green Obsidian'); + my $code_name = get_var("CODENAME", 'Green Obsidian'); my $version = "$version_id ($code_name)"; my $platform_id = "platform:$eltag"; - my $pretty = "$fullname $version_id ($code_name)"; + my $pretty = "$fullname $version_id ($code_name)"; #Now. we can start testing the real values from the installed system. my @fails = (); @@ -65,7 +65,7 @@ sub run { rec_log "VERSION should be $version and is $strip", $strip eq $version, $failref; # Test for version_id - $strip = strip_marks($content{'VERSION_ID'}); + $strip = strip_marks($content{'VERSION_ID'}); rec_log "VERSION_ID should be $version_id and is $strip", $strip eq $version_id, $failref; # Test for platform_id @@ -81,7 +81,7 @@ sub run { rec_log "ROCKY_SUPPORT_PRODUCT should be $name and is $strip", $strip eq $fullname, $failref; # Test for Rocky Support Product Version - $strip = strip_marks($content{ROCKY_SUPPORT_PRODUCT_VERSION}); + $strip = strip_marks($content{ROCKY_SUPPORT_PRODUCT_VERSION}); rec_log "ROCKY_SUPPORT_PRODUCT_VERSION should be $target and is $strip", $strip eq $target, $failref; # VERSION_ID should be 8.4 and is "8.4" @@ -89,10 +89,6 @@ sub run { # ROCKY_SUPPORT_PRODUCT should be Rocky and is Rocky Linux # ROCKY_SUPPORT_PRODUCT_VERSION should be and is 8 at /var/lib/openqa/share/tests/rocky/tests/os_release.pm line 95. - - - - # Check for fails, count them, collect their messages and die if something was found. my $failcount = scalar @fails; script_run "echo \"There were $failcount failures in total.\" >> /tmp/os-release.log";