testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

_check_install_source: handle 'added repo' and 'enabled repo'

Browse Source 
The text changed from 'added repo' to 'enabled repo' in Rawhide
after F28, so let's handle both at least till F28 is EOL.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-05-07 15:49:24 -07:00
parent c3a511e052
commit fdaa4783e7
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/_check_install_source.pm
View File

@ -30,7 +30,19 @@ sub run {
} }
} }
else { else {
assert_script_run "grep \"added repo: 'anaconda'.*${repourl}\" /tmp/packaging.log"; # there are only three hard problems in software development:
# naming things, cache expiry, off-by-one errors...and quoting
# we need single quotes (at the perl level) around the start
# of this, so the backslashes are not interpreted by perl but
# passed through to ultimately be interpreted by 'grep'
# itself. We need double quotes around $repourl so that *is*
# interpreted by perl. And we need quotes around the entire
# expression at the bash level, and single quotes around the
# text 'anaconda' at the level of grep, as the string we're
# actually matching on literally has 'anaconda' in it. We need
# (added|enabled) till F28 goes EOL: the log line was changed
# in Rawhide after F28 came out.
assert_script_run 'grep "\(added\|enabled\) repo: ' . "'anaconda'.*${repourl}" . '" /tmp/packaging.log';
} }
send_key "ctrl-alt-f6"; send_key "ctrl-alt-f6";