From 2b02253ecb82c5cf69373fd865f3ec0279b1ac98 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 3 May 2021 13:55:43 -0700 Subject: [PATCH] Fix modularity test to use Rawhide repo on Rawhide Signed-off-by: Adam Williamson --- tests/modularity_module_list.pm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/modularity_module_list.pm b/tests/modularity_module_list.pm index 4f2d170a..d3c61b9e 100644 --- a/tests/modularity_module_list.pm +++ b/tests/modularity_module_list.pm @@ -14,10 +14,16 @@ sub run { # Check that modular repositories are installed and enabled. # If the repository does not exist, the output of the command is empty. - my $mfedora_output = script_output("dnf repolist --enabled fedora-modular"); - die "The fedora-modular repo seems not to be installed." unless (length $mfedora_output); - my $mupdates_output = script_output("dnf repolist --enabled updates-modular"); - die "The updates-modular repo seems not to be installed." unless (length $mupdates_output); + if (lc(get_var('VERSION')) eq "rawhide") { + my $mrawhide_output = script_output("dnf repolist --enabled rawhide-modular"); + die "The rawhide-modular repo seems not to be installed." unless (length $mrawhide_output); + } + else { + my $mfedora_output = script_output("dnf repolist --enabled fedora-modular"); + die "The fedora-modular repo seems not to be installed." unless (length $mfedora_output); + my $mupdates_output = script_output("dnf repolist --enabled updates-modular"); + die "The updates-modular repo seems not to be installed." unless (length $mupdates_output); + } # Check that modularity works and dnf can list the modules. my $modules = script_output('dnf module list --disablerepo=updates-modular --disablerepo=updates-testing-modular', timeout => 270);