srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-21 21:43:08 +00:00
Code Issues Releases Activity

Revert "Fix the os_release.pm and fedora_release.pm."

Browse Source 
This reverts commit 182bfdaa55. The
problem was not in the test code here, it's just that the tests
were run with RAWREL set to 36 when it should be 37; this is
because fedfind's data source hadn't been updated for 36 branch
when the tests ran. It's tricky to time this exactly right -
ideally we'd probably update fedfind's data source one second
before the first Branched compose completes, but of course that's
difficult in practice.
This commit is contained in:
Adam Williamson 2022-02-09 09:59:45 -08:00
parent 182bfdaa55
commit 29c5c01431
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/fedora_release.pm
View File

@ -19,9 +19,7 @@ sub run {
# IoT has a branch that acts more or less like Rawhide, but has # IoT has a branch that acts more or less like Rawhide, but has
# its version as the Rawhide release number, not 'Rawhide'. This # its version as the Rawhide release number, not 'Rawhide'. This
# handles that # handles that
if (get_var("SUBVARIANT") eq "IoT") { $tospell = 'Rawhide' if ($tospell eq $rawrel);
$tospell = 'Rawhide' if ($tospell eq $rawrel);
}
# this is the Rawhide release number, which we expect to see. # this is the Rawhide release number, which we expect to see.
$expectver = $rawrel if ($expectver eq "Rawhide"); $expectver = $rawrel if ($expectver eq "Rawhide");
# Create a spelt form of the version number. # Create a spelt form of the version number.
@ -29,8 +27,7 @@ sub run {
# Create the expected content of the release file # Create the expected content of the release file
# and compare it with its real counterpart. # and compare it with its real counterpart.
my $expected = "Fedora release $expectver ($speltnum)"; my $expected = "Fedora release $expectver ($speltnum)";
diag("The fedora-release content to validate: $expected"); validate_script_output 'cat /etc/fedora-release', sub { $_ eq $expected };
validate_script_output("cat /etc/fedora-release", qr/$expected/);
} }
sub test_flags { sub test_flags {

4
tests/os_release.pm
View File

@ -67,9 +67,7 @@ sub run {
# IoT has a branch that acts more or less like Rawhide, but has # IoT has a branch that acts more or less like Rawhide, but has
# its version as the Rawhide release number, not 'Rawhide'. This # its version as the Rawhide release number, not 'Rawhide'. This
# handles that # handles that
if (get_var("SUBVARIANT") eq "IoT") { $version_id = 'Rawhide' if ($version_id eq $rawrel);
$version_id = 'Rawhide' if ($version_id eq $rawrel);
}
my $varstr = spell_version_number($version_id); my $varstr = spell_version_number($version_id);
my $target = lc($version_id); my $target = lc($version_id);
$version_id = $rawrel if ($version_id eq "Rawhide"); $version_id = $rawrel if ($version_id eq "Rawhide");