mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-21 21:46:15 +02:00
tests/functional: Make our grep* helpers reject newlines in the query
Newlines behave like *OR*; not "and then".
This commit is contained in:
parent
f2df3f0c6c
commit
644b97ce25
2 changed files with 21 additions and 3 deletions
|
@ -336,13 +336,24 @@ callerPrefix() {
|
|||
done
|
||||
}
|
||||
|
||||
checkGrepArgs() {
|
||||
local arg
|
||||
for arg in "$@"; do
|
||||
if [[ "$arg" != "${arg//$'\n'/_}" ]]; then
|
||||
echo "$(callerPrefix)newline not allowed in arguments; grep would try each line individually as if connected by an OR operator" >&2
|
||||
return -101
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
# `grep -v` doesn't work well for exit codes. We want `!(exist line l. l
|
||||
# matches)`. It gives us `exist line l. !(l matches)`.
|
||||
#
|
||||
# `!` normally doesn't work well with `set -e`, but when we wrap in a
|
||||
# function it *does*.
|
||||
grepInverse() {
|
||||
! grep "$@"
|
||||
checkGrepArgs "$@" && \
|
||||
! grep "$@"
|
||||
}
|
||||
|
||||
# A shorthand, `> /dev/null` is a bit noisy.
|
||||
|
@ -357,12 +368,14 @@ grepInverse() {
|
|||
# the producer into the pipe. But rest assured we've seen it happen in
|
||||
# CI reliably.
|
||||
grepQuiet() {
|
||||
grep "$@" > /dev/null
|
||||
checkGrepArgs "$@" && \
|
||||
grep "$@" > /dev/null
|
||||
}
|
||||
|
||||
# The previous two, combined
|
||||
grepQuietInverse() {
|
||||
! grep "$@" > /dev/null
|
||||
checkGrepArgs "$@" && \
|
||||
! grep "$@" > /dev/null
|
||||
}
|
||||
|
||||
# Return the number of arguments
|
||||
|
|
|
@ -108,3 +108,8 @@ unset res
|
|||
res=$(set -eu -o pipefail; echo foo | expect 1 grepQuietInverse foo | wc -c)
|
||||
(( res == 0 ))
|
||||
unset res
|
||||
|
||||
# `grepQuiet` does not allow newlines in its arguments, because grep quietly
|
||||
# treats them as multiple queries.
|
||||
( echo foo; echo bar; ) | expectStderr -101 grepQuiet $'foo\nbar' \
|
||||
| grepQuiet -E 'test-infra\.sh:[0-9]+: in call to grepQuiet: newline not allowed in arguments; grep would try each line individually as if connected by an OR operator'
|
||||
|
|
Loading…
Reference in a new issue