diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2023-04-05 15:50:42 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2023-04-24 21:58:35 +0200 |
commit | 128db0aa0098b58b415065c2955f9abc7fc967e1 (patch) | |
tree | 55a7c3b871ba371586e895c07a54d75fb2f502b8 /test/units/testsuite-50.sh | |
parent | testsuite-04: remove unnecessary conditional (diff) | |
download | systemd-128db0aa0098b58b415065c2955f9abc7fc967e1.tar.xz systemd-128db0aa0098b58b415065c2955f9abc7fc967e1.zip |
test: drop uses of "&& { echo 'unexpected success'; exit 1; }"
Brief is sweet.
Diffstat (limited to 'test/units/testsuite-50.sh')
-rwxr-xr-x | test/units/testsuite-50.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/units/testsuite-50.sh b/test/units/testsuite-50.sh index f6b2467a98..75cb4c49b2 100755 --- a/test/units/testsuite-50.sh +++ b/test/units/testsuite-50.sh @@ -398,8 +398,8 @@ systemctl is-active testservice-50e.service # ExtensionDirectories will set up an overlay mkdir -p "${image_dir}/app0" "${image_dir}/app1" "${image_dir}/app-nodistro" -systemd-run -P --property ExtensionDirectories="${image_dir}/nonexistent" --property RootImage="${image}.raw" cat /opt/script0.sh && { echo 'unexpected success'; exit 1; } -systemd-run -P --property ExtensionDirectories="${image_dir}/app0" --property RootImage="${image}.raw" cat /opt/script0.sh && { echo 'unexpected success'; exit 1; } +(! systemd-run -P --property ExtensionDirectories="${image_dir}/nonexistent" --property RootImage="${image}.raw" cat /opt/script0.sh) +(! systemd-run -P --property ExtensionDirectories="${image_dir}/app0" --property RootImage="${image}.raw" cat /opt/script0.sh) systemd-dissect --mount /usr/share/app0.raw "${image_dir}/app0" systemd-dissect --mount /usr/share/app1.raw "${image_dir}/app1" systemd-dissect --mount /usr/share/app-nodistro.raw "${image_dir}/app-nodistro" @@ -446,7 +446,7 @@ mkdir -p /run/extensions/app-reject/usr/lib/{extension-release.d/,systemd/system echo "ID=_any" >/run/extensions/app-reject/usr/lib/extension-release.d/extension-release.app-reject echo "ID=_any" >/run/extensions/app-reject/usr/lib/os-release touch /run/extensions/app-reject/usr/lib/systemd/system/other_file -systemd-sysext merge && { echo 'unexpected success'; exit 1; } +(! systemd-sysext merge) test ! -e /usr/lib/systemd/system/some_file test ! -e /usr/lib/systemd/system/other_file systemd-sysext unmerge @@ -515,14 +515,14 @@ mkdir -p /run/confexts/test/etc/extension-release.d echo "ID=_any" >/run/confexts/test/etc/extension-release.d/extension-release.test echo "ARCHITECTURE=_any" >>/run/confexts/test/etc/extension-release.d/extension-release.test echo "MARKER_CONFEXT_123" >/run/confexts/test/etc/testfile -cat <<EOF>/run/confexts/test/etc/testscript +cat <<EOF >/run/confexts/test/etc/testscript #!/bin/bash echo "This should not happen" EOF chmod +x /run/confexts/test/etc/testscript systemd-confext merge grep -q -F "MARKER_CONFEXT_123" /etc/testfile -/etc/testscript && { echo 'unexpected success'; exit 1; } +(! /etc/testscript) systemd-confext status systemd-confext unmerge rm -rf /run/confexts/ |