From 13391986b50e76cc58744c44ccb8124e48fd3c3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 3 Mar 2022 18:55:26 +0100
Subject: [PATCH] TEST-29: trim output a bit

IIUC, pipefail doesn't matter for a sequence of commands joined with &&, and we
don't have any pipes. And such a failing expression also does not trigger an
exit, so the set +e/set -e were noops.
---
 test/test-functions        |  8 ++++----
 test/units/testsuite-29.sh | 20 ++------------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/test/test-functions b/test/test-functions
index e815ce1c58..c4da06d870 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -607,7 +607,7 @@ ExecStart=sleep 120
 EOF
         cp "$initdir/usr/lib/systemd/system/minimal-app0.service" "$initdir/usr/lib/systemd/system/minimal-app0-foo.service"
 
-        mksquashfs "$initdir" "$oldinitdir/usr/share/minimal_0.raw" -noappend
+        mksquashfs "$initdir" "$oldinitdir/usr/share/minimal_0.raw" -noappend -quiet
         veritysetup format "$oldinitdir/usr/share/minimal_0.raw" "$oldinitdir/usr/share/minimal_0.verity" | \
             grep '^Root hash:' | cut -f2 | tr -d '\n' >"$oldinitdir/usr/share/minimal_0.roothash"
 
@@ -615,7 +615,7 @@ EOF
         rm "$initdir/usr/lib/systemd/system/minimal-app0-foo.service"
         cp "$initdir/usr/lib/systemd/system/minimal-app0.service" "$initdir/usr/lib/systemd/system/minimal-app0-bar.service"
 
-        mksquashfs "$initdir" "$oldinitdir/usr/share/minimal_1.raw" -noappend
+        mksquashfs "$initdir" "$oldinitdir/usr/share/minimal_1.raw" -noappend -quiet
         veritysetup format "$oldinitdir/usr/share/minimal_1.raw" "$oldinitdir/usr/share/minimal_1.verity" | \
             grep '^Root hash:' | cut -f2 | tr -d '\n' >"$oldinitdir/usr/share/minimal_1.roothash"
 
@@ -647,7 +647,7 @@ cat /usr/lib/extension-release.d/extension-release.app0
 EOF
         chmod +x "$initdir/opt/script0.sh"
         echo MARKER=1 >"$initdir/usr/lib/systemd/system/some_file"
-        mksquashfs "$initdir" "$oldinitdir/usr/share/app0.raw" -noappend
+        mksquashfs "$initdir" "$oldinitdir/usr/share/app0.raw" -noappend -quiet
 
         export initdir="$TESTDIR/app1"
         mkdir -p "$initdir/usr/lib/extension-release.d" "$initdir/usr/lib/systemd/system" "$initdir/opt"
@@ -673,7 +673,7 @@ cat /usr/lib/extension-release.d/extension-release.app2
 EOF
         chmod +x "$initdir/opt/script1.sh"
         echo MARKER=1 >"$initdir/usr/lib/systemd/system/other_file"
-        mksquashfs "$initdir" "$oldinitdir/usr/share/app1.raw" -noappend
+        mksquashfs "$initdir" "$oldinitdir/usr/share/app1.raw" -noappend -quiet
     )
 }
 
diff --git a/test/units/testsuite-29.sh b/test/units/testsuite-29.sh
index 1b927a8305..75731b41f2 100755
--- a/test/units/testsuite-29.sh
+++ b/test/units/testsuite-29.sh
@@ -31,21 +31,13 @@ portablectl "${ARGS[@]}" attach --now --runtime /usr/share/minimal_0.raw minimal
 
 systemctl is-active minimal-app0.service
 systemctl is-active minimal-app0-foo.service
-set +o pipefail
-set +e
 systemctl is-active minimal-app0-bar.service && exit 1
-set -e
-set -o pipefail
 
 portablectl "${ARGS[@]}" reattach --now --runtime /usr/share/minimal_1.raw minimal-app0
 
 systemctl is-active minimal-app0.service
 systemctl is-active minimal-app0-bar.service
-set +o pipefail
-set +e
 systemctl is-active minimal-app0-foo.service && exit 1
-set -e
-set -o pipefail
 
 portablectl list | grep -q -F "minimal_1"
 
@@ -55,28 +47,20 @@ portablectl list | grep -q -F "No images."
 
 # portablectl also works with directory paths rather than images
 
-unsquashfs -dest /tmp/minimal_0 /usr/share/minimal_0.raw
-unsquashfs -dest /tmp/minimal_1 /usr/share/minimal_1.raw
+unsquashfs -q -dest /tmp/minimal_0 /usr/share/minimal_0.raw
+unsquashfs -q -dest /tmp/minimal_1 /usr/share/minimal_1.raw
 
 portablectl "${ARGS[@]}" attach --copy=symlink --now --runtime /tmp/minimal_0 minimal-app0
 
 systemctl is-active minimal-app0.service
 systemctl is-active minimal-app0-foo.service
-set +o pipefail
-set +e
 systemctl is-active minimal-app0-bar.service && exit 1
-set -e
-set -o pipefail
 
 portablectl "${ARGS[@]}" reattach --now --enable --runtime /tmp/minimal_1 minimal-app0
 
 systemctl is-active minimal-app0.service
 systemctl is-active minimal-app0-bar.service
-set +o pipefail
-set +e
 systemctl is-active minimal-app0-foo.service && exit 1
-set -e
-set -o pipefail
 
 portablectl list | grep -q -F "minimal_1"