From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 26 Nov 2023 20:59:56 +0000 (+0900)
Subject: test: drop remaining console output
X-Git-Tag: v255-rc4~39^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a97d617f189748a3b10927ff507b60dca0d40ca0;p=thirdparty%2Fsystemd.git

test: drop remaining console output

Follow-up for fa6f37c04391d0103c95e24813ad345c2d5c4b67.

Partially reverts d5ab23aa54229e9e89427e7d20883bd8c93fd976 and
3540ce8587cbd21ce9c2dbec72ea7fa3d1b38a5f.
---

diff --git a/test/testsuite-80.units/fdstore-nopin.service b/test/testsuite-80.units/fdstore-nopin.service
index 58a687a411c..29ffd230336 100644
--- a/test/testsuite-80.units/fdstore-nopin.service
+++ b/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
diff --git a/test/testsuite-80.units/fdstore-pin.service b/test/testsuite-80.units/fdstore-pin.service
index bc78ee0a4cb..913daa2725b 100644
--- a/test/testsuite-80.units/fdstore-pin.service
+++ b/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
diff --git a/test/units/autorelabel.service b/test/units/autorelabel.service
index dd0df8161bf..7e5f9a2b89b 100644
--- a/test/units/autorelabel.service
+++ b/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
diff --git a/test/units/testsuite-75.service b/test/units/testsuite-75.service
index 1b0cd56ee45..111cde30ee2 100644
--- a/test/units/testsuite-75.service
+++ b/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
diff --git a/test/units/testsuite-80.service b/test/units/testsuite-80.service
index 82b08a1c8b0..4c7f5d5ebd3 100644
--- a/test/units/testsuite-80.service
+++ b/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
diff --git a/test/units/testsuite-80.sh b/test/units/testsuite-80.sh
index faadb555b10..97b222a9e89 100755
--- a/test/units/testsuite-80.sh
+++ b/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