From 131f59693a93fd0ab794816a130eb577e8a00f09 Mon Sep 17 00:00:00 2001 From: Denys Gonchar Date: Fri, 24 Nov 2023 12:01:16 +0100 Subject: [PATCH] making GH Actions happy --- integration_test/helper.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/integration_test/helper.sh b/integration_test/helper.sh index cdec7c87..4d540037 100644 --- a/integration_test/helper.sh +++ b/integration_test/helper.sh @@ -22,9 +22,11 @@ function contains_all() { for pattern in "$@"; do ret="$(echo "$output" | grep -L -e "$pattern" | wc -l)" if [ "$ret" -ne "0" ]; then - [ "$(($acc))" -eq "0" ] && echo "output: '${output}'" + [ "$(($acc))" -eq "0" ] && { + echo "contains_all FAILED" + echo "stdin: '${output}'"; } echo "pattern is missing: '${pattern}'" - fi > /dev/tty + fi >&2 acc+="+${ret}" done test "$(($acc))" -eq 0 @@ -36,9 +38,11 @@ function doesnt_contain_any() { for pattern in "$@"; do ret="$(echo "$output" | grep -l -e "$pattern" | wc -l || true)" if [ "$ret" -ne "0" ]; then - [ "$(($acc))" -eq "0" ] && echo "output: '${output}'" + [ "$(($acc))" -eq "0" ] && { + echo "doesnt_contain_any FAILED" + echo "stdin: '${output}'"; } echo "pattern is present: '${pattern}'" - fi > /dev/tty + fi >&2 acc+="+${ret}" done test "$(($acc))" -eq 0