From 8029a019bacf4b111bed58dfeb16545a834d84cf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20Mr=C3=A1zek?= Date: Tue, 26 Nov 2024 21:43:48 +0100 Subject: [PATCH] tests/packaging/interactive: suppress some commands stdout --- tests/packaging/interactive/cache-clear.sh | 4 ++-- tests/packaging/interactive/etag.sh | 4 ---- tests/packaging/interactive/metrics.sh | 4 ++-- tests/packaging/interactive/schema.sh | 6 +++--- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/tests/packaging/interactive/cache-clear.sh b/tests/packaging/interactive/cache-clear.sh index 79d88a123..512096d63 100755 --- a/tests/packaging/interactive/cache-clear.sh +++ b/tests/packaging/interactive/cache-clear.sh @@ -1,14 +1,14 @@ #!/usr/bin/env bash # clear full cache -kresctl cache clear +kresctl cache clear > /dev/null if [ "$?" -ne "0" ]; then echo "Could not clear full cache" exit 1 fi # clear just example.com. AAAA record, get JSON output -kresctl cache clear --json --exact-name --rr-type AAAA example.com. | python3 -m json.tool +kresctl cache clear --json --exact-name --rr-type AAAA example.com. | python3 -m json.tool > /dev/null if [ "$?" -ne "0" ]; then echo "Could not clear example.com. AAAA record or output is not a valid JSON" exit 1 diff --git a/tests/packaging/interactive/etag.sh b/tests/packaging/interactive/etag.sh index 7038e0069..d40f358f3 100755 --- a/tests/packaging/interactive/etag.sh +++ b/tests/packaging/interactive/etag.sh @@ -4,11 +4,7 @@ set -e socket_opt="--unix-socket /run/knot-resolver/kres-api.sock" -echo " etag" etag="$(curl --silent $socket_opt --fail http://localhost:5000/v1/config -o /dev/null -v 2>&1 | grep ETag | sed 's/< ETag: //;s/\s//')" -echo " etag OK" -echo " status" status=$(curl --silent $socket_opt --fail http://localhost:5000/v1/config --header "If-None-Match: $etag" -w "%{http_code}" -o /dev/null) test "$status" -eq 304 -echo " status OK" diff --git a/tests/packaging/interactive/metrics.sh b/tests/packaging/interactive/metrics.sh index 99b21124d..fbf2ff399 100755 --- a/tests/packaging/interactive/metrics.sh +++ b/tests/packaging/interactive/metrics.sh @@ -4,13 +4,13 @@ set -e curl --silent --fail --unix-socket /run/knot-resolver/kres-api.sock http://localhost/metrics > /dev/null -kresctl metrics +kresctl metrics > /dev/null if [ "$?" -ne "0" ]; then echo "Could not get metrics in JSON format" exit 1 fi -kresctl metrics --prometheus +kresctl metrics --prometheus > /dev/null if [ "$?" -ne "0" ]; then echo "Could not get metrics in Prometheus format" exit 1 diff --git a/tests/packaging/interactive/schema.sh b/tests/packaging/interactive/schema.sh index 3ea45d522..9f6716538 100755 --- a/tests/packaging/interactive/schema.sh +++ b/tests/packaging/interactive/schema.sh @@ -1,14 +1,14 @@ -#!/bin/bash +#!/usr/bin/env bash set -e -kresctl schema +kresctl schema > /dev/null if [ "$?" -ne "0" ]; then echo "Failed to generate JSON schema with 'kresctl'" exit 1 fi -kresctl schema --live +kresctl schema --live > /dev/null if [ "$?" -ne "0" ]; then echo "Failed to get JSON schema from the running resolver" exit 1 -- 2.47.2