Merge pull request #30203 from yuwata/resolve-dump-cache

resolve: fix varlink message verification

test/test-functions

@@ -1929,6 +1929,7 @@ check_result_nspawn_unittests() {
     check_coverage_reports "$workspace" || ret=5
 
     save_journal "$workspace/var/log/journal" $ret
+    echo "${JOURNAL_LIST:-"No journals were saved"}"
 
     _umount_dir "${initdir:?}"
 
@@ -1962,6 +1963,7 @@ check_result_qemu_unittests() {
     check_coverage_reports "$initdir" || ret=5
 
     save_journal "$initdir/var/log/journal" $ret
+    echo "${JOURNAL_LIST:-"No journals were saved"}"
 
     _umount_dir "$initdir"
 

test/testsuite-80.units/fdstore-nopin.service

@@ -4,5 +4,3 @@ NotifyAccess=all
 FileDescriptorStoreMax=10
 FileDescriptorStorePreserve=restart
 ExecStart=/usr/lib/systemd/tests/testdata/testsuite-80.units/fdstore-pin.sh 0
-StandardOutput=journal+console
-StandardError=journal+console

test/testsuite-80.units/fdstore-pin.service

@@ -4,5 +4,3 @@ NotifyAccess=all
 FileDescriptorStoreMax=10
 FileDescriptorStorePreserve=yes
 ExecStart=/usr/lib/systemd/tests/testdata/testsuite-80.units/fdstore-pin.sh 1
-StandardOutput=journal+console
-StandardError=journal+console

test/units/autorelabel.service

@@ -14,7 +14,6 @@ ExecStart=sh -xec 'echo 0 >/sys/fs/selinux/enforce; fixfiles -f -F relabel; rm /
 Type=oneshot
 TimeoutSec=infinity
 RemainAfterExit=yes
-StandardOutput=journal+console
 
 [Install]
 WantedBy=basic.target

test/units/end.service

@@ -7,5 +7,5 @@ OnFailureJobMode=replace-irreversibly
 
 [Service]
 Type=oneshot
-ExecStart=/bin/sh -x -c 'systemctl poweroff --no-block'
+ExecStart=/usr/lib/systemd/tests/testdata/units/end.sh
 TimeoutStartSec=5m

test/units/end.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+set -eux
+set -o pipefail
+
+(! journalctl -q -o short-monotonic --grep "didn't pass validation" >>/failed)
+
+systemctl poweroff --no-block
+exit 0

test/units/testsuite-02.sh

@@ -63,9 +63,6 @@ report_result() {
         echo "$name OK"
         echo "$name" >>/testok
     fi
-
-    systemd-cat echo "--- $name ---"
-    systemd-cat cat "/$name.log"
 }
 
 set +x

test/units/testsuite-75.service

@@ -6,5 +6,3 @@ Description=Tests for systemd-resolved
 ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
-StandardOutput=journal+console
-StandardError=journal+console

test/units/testsuite-75.sh

@@ -530,6 +530,11 @@ grep -qF "fd00:dead:beef:cafe::123" "$RUN_OUT"
 #run dig +dnssec this.does.not.exist.untrusted.test
 #grep -qF "status: NXDOMAIN" "$RUN_OUT"
 
+### Test resolvectl show-cache
+run resolvectl show-cache
+run resolvectl show-cache --json=short
+run resolvectl show-cache --json=pretty
+
 # Issue: https://github.com/systemd/systemd/issues/29580 (part #1)
 dig @127.0.0.54 signed.test
 

test/units/testsuite-80.service

@@ -6,5 +6,3 @@ Description=TEST-80-NOTIFYACCESS
 ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
-StandardOutput=journal+console
-StandardError=journal+console

test/units/testsuite-80.sh

@@ -65,7 +65,7 @@ EOF
 chmod +x "$MYSCRIPT"
 
 MYUNIT="myunit$RANDOM.service"
-systemd-run -u "$MYUNIT" -p Type=notify -p StandardOutput=journal+console -p StandardError=journal+console -p FileDescriptorStoreMax=7 "$MYSCRIPT"
+systemd-run -u "$MYUNIT" -p Type=notify -p FileDescriptorStoreMax=7 "$MYSCRIPT"
 
 test "$(systemd-analyze fdstore "$MYUNIT" | wc -l)" -eq 2
 systemd-analyze fdstore "$MYUNIT" --json=short