From 03a56eb0da17ef8cc7a476f950193a1173826cc0 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 1 Mar 2019 08:49:08 -0800 Subject: [PATCH] Avoid spurious repo check error for universal tests on netinst As there is *always* a base repo error when booting a netinst image, this check was giving us spurious failures when running universal tests on a netinst (which we are currently doing on ppc64 it seems). Tweak it a bit to hopefully avoid this. Signed-off-by: Adam Williamson --- tests/_check_install_source.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/_check_install_source.pm b/tests/_check_install_source.pm index 360d9971..a1b07ee7 100644 --- a/tests/_check_install_source.pm +++ b/tests/_check_install_source.pm @@ -58,8 +58,14 @@ sub run { assert_script_run 'grep "\(added\|enabled\) repo: ' . "\\('anaconda'\\|''\\).*${repourl}" . '" /tmp/packaging.log'; } if ($repourl) { - # check we don't have an error indicating our repo wasn't used - assert_script_run '! grep "base repo.*not valid" /tmp/packaging.log'; + # check we don't have an error indicating our repo wasn't used. + # we except error with 'cdrom/file' in it because this error: + # base repo (cdrom/file:///run/install/repo) not valid -- removing it + # *always* happens when booting a netinst (that's just anaconda + # trying to use the image itself as a repo and failing because it's + # not a DVD), and this was causing false failures when running + # universal tests on netinsts + assert_script_run '! grep "base repo.*not valid" /tmp/packaging.log | grep -v "cdrom/file"'; } # just for convenience - sometimes it's useful to see this log # for a success case