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

_check_install_source: more fixes for upstream changes

Browse Source 
anaconda is really kicking log messages around lately.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-04-14 14:04:51 -07:00
parent 8bc74fd5dc
commit da3f9df5b7
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/_check_install_source.pm
View File

@ -57,9 +57,9 @@ sub run {
elsif ($repourl) { elsif ($repourl) {
# there are only three hard problems in software development: # there are only three hard problems in software development:
# naming things, cache expiry, off-by-one errors...and quoting # naming things, cache expiry, off-by-one errors...and quoting
assert_script_run 'grep "Added the \'anaconda\'" /tmp/anaconda.log'; assert_script_run 'grep "Added the \'anaconda\'" /tmp/anaconda.log /tmp/syslog';
assert_script_run 'grep "Load metadata for the \'anaconda\'" /tmp/anaconda.log'; assert_script_run 'grep "Load metadata for the \'anaconda\'" /tmp/anaconda.log /tmp/syslog';
assert_script_run 'grep "Loaded metadata from.*' . ${repourl} . '" /tmp/anaconda.log'; assert_script_run 'grep "Loaded metadata from.*' . ${repourl} . '" /tmp/anaconda.log /tmp/syslog';
} }
if ($repourl) { if ($repourl) {
# check we don't have an error indicating our repo wasn't used. # check we don't have an error indicating our repo wasn't used.
@ -70,6 +70,11 @@ sub run {
# not a DVD), and this was causing false failures when running # not a DVD), and this was causing false failures when running
# universal tests on netinsts # universal tests on netinsts
assert_script_run '! grep "base repo.*not valid" /tmp/packaging.log | grep -v "cdrom/file"'; assert_script_run '! grep "base repo.*not valid" /tmp/packaging.log | grep -v "cdrom/file"';
# above form is before 3b5f8f4a61 , below form is after it; we
# don't seem to get the error for the cdrom repo on netinsts as
# of Fedora-Rawhide-20230414.n.0 at least. I'm not 100% sure
# where this message would wind up, so check everywhere
assert_script_run '! grep "base repository is invalid" /tmp/packaging.log /tmp/anaconda.log /tmp/syslog';
} }
# just for convenience - sometimes it's useful to see this log # just for convenience - sometimes it's useful to see this log
# for a success case # for a success case