From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 15 Dec 2022 06:28:56 +0000 (+0900)
Subject: test: suppress echo in monitor_check_rr()
X-Git-Tag: v253-rc1~265^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef09861a0b0aa7c6a948f4e008e2fea312bc68d6;p=thirdparty%2Fsystemd.git

test: suppress echo in monitor_check_rr()
---

diff --git a/test/units/testsuite-75.sh b/test/units/testsuite-75.sh
index d2062c7b059..d0c71334125 100755
--- a/test/units/testsuite-75.sh
+++ b/test/units/testsuite-75.sh
@@ -16,17 +16,17 @@ run() {
     "$@" |& tee "$RUN_OUT"
 }
 
-monitor_check_rr() {
+monitor_check_rr() (
+    set +x
+    set +o pipefail
     local match="${1:?}"
 
     # Wait until the first mention of the specified log message is
     # displayed. We turn off pipefail for this, since we don't care about the
     # lhs of this pipe expression, we only care about the rhs' result to be
     # clean
-    set +o pipefail
     journalctl -u resmontest.service -f --full | grep -m1 "$match"
-    set -o pipefail
-}
+)
 
 # Test for resolvectl, resolvconf
 systemctl unmask systemd-resolved.service