From 7603b38dec8405f47458538234d052d0e0267007 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 28 Mar 2023 10:26:34 -0700 Subject: [PATCH] Update _check_install_source for a change to NFS handling A change to how anaconda handles NFS repos changed the log messages we get when we use one. We may need further changes for using NFS as a base repo when this change hits Rawhide nightly. Signed-off-by: Adam Williamson --- tests/_check_install_source.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/_check_install_source.pm b/tests/_check_install_source.pm index 5f224cfa..92f8390e 100644 --- a/tests/_check_install_source.pm +++ b/tests/_check_install_source.pm @@ -32,7 +32,9 @@ sub run { assert_script_run 'grep "Added the \'addrepo\'" /tmp/anaconda.log'; # ...and this tells us it worked (I hope). assert_script_run 'grep "Load metadata for the \'addrepo\'" /tmp/anaconda.log'; - assert_script_run 'grep "Loaded metadata from.*file:///run/install/addrepo.nfs" /tmp/anaconda.log'; + # addrepo.nfs is from before Fedora 39, sources/mount-1000-nfs-device + # is from F39+ + assert_script_run 'grep -E "Loaded metadata from.*file:///run/install/(addrepo.nfs|sources/mount-1000-nfs-device)" /tmp/anaconda.log'; } } if ($repourl =~ /^hd:/) {