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 58a687a411c160392086ce1c6f188eb40346b82c..29ffd23033637598d85926012ca44387d3a95365 100644 (file)
--- 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 bc78ee0a4cbbf072326a6918f59100bc3363b710..913daa2725bde5b66595497efadde7c2a3883675 100644 (file)
--- 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 dd0df8161bfa60eaf21b438b6cb2e189e3a116be..7e5f9a2b89bdc9ad8805ad9038d3960c72689edb 100644 (file)
--- 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 1b0cd56ee45a30f911744e72ab2fea9799872b6d..111cde30ee22d09f4173eec654f57938dd6c2818 100644 (file)
--- 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 82b08a1c8b0601f0c62e8f13f674250145ceaa97..4c7f5d5ebd3ac9dfdc815db0be4752de68bee185 100644 (file)
--- 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 faadb555b10f4184a11aa468ec1bb34ec15a8054..97b222a9e8932f3758317548648aabcde76822dd 100755 (executable)
--- 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