keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests/libtest-core: support multiple literal checks

Browse Source 
`grep` supports checking multiple fixed strings separated by newlines,
but it's mostly just easier to pass them as separate arguments, so let's
support that. This is now at parity with the similar
`assert_file_has_content`.

Will upstream this to ostree as well once reviewed.

Closes: #1200
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2018-01-11 18:36:27 +00:00 committed by Atomic Bot
parent 9f7511a5d8
commit 738fbc633b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/common/libtest-core.sh
View File

@ -105,9 +105,12 @@ assert_file_has_content () {
} }
assert_file_has_content_literal () { assert_file_has_content_literal () {
if ! grep -q -F -e "$2" "$1"; then fpath=$1; shift
_fatal_print_file "$1" "File '$1' doesn't match fixed string list '$2'" for s in "$@"; do
fi if ! grep -q -F -e "$s" "$fpath"; then
_fatal_print_file "$fpath" "File '$fpath' doesn't match fixed string list '$s'"
fi
done
} }
assert_symlink_has_content () { assert_symlink_has_content () {