diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-11-26 21:59:56 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-11-27 20:10:25 +0100 |
| commit | a97d617f189748a3b10927ff507b60dca0d40ca0 (patch) | |
| tree | 6234e7dbb939642674364e538cc9bd20ba87802e | |
| parent | test: add simple coverity test for 'resolvectl show-cache' (diff) | |
| download | systemd-a97d617f189748a3b10927ff507b60dca0d40ca0.tar.xz systemd-a97d617f189748a3b10927ff507b60dca0d40ca0.zip | |
test: drop remaining console output
Follow-up for fa6f37c04391d0103c95e24813ad345c2d5c4b67.
Partially reverts d5ab23aa54229e9e89427e7d20883bd8c93fd976 and
3540ce8587cbd21ce9c2dbec72ea7fa3d1b38a5f.
| -rw-r--r-- | test/testsuite-80.units/fdstore-nopin.service | 2 | ||||
| -rw-r--r-- | test/testsuite-80.units/fdstore-pin.service | 2 | ||||
| -rw-r--r-- | test/units/autorelabel.service | 1 | ||||
| -rw-r--r-- | test/units/testsuite-75.service | 2 | ||||
| -rw-r--r-- | test/units/testsuite-80.service | 2 | ||||
| -rwxr-xr-x | test/units/testsuite-80.sh | 2 |
6 files changed, 1 insertions, 10 deletions
diff --git a/test/testsuite-80.units/fdstore-nopin.service b/test/testsuite-80.units/fdstore-nopin.service index 58a687a411..29ffd23033 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 bc78ee0a4c..913daa2725 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 dd0df8161b..7e5f9a2b89 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 1b0cd56ee4..111cde30ee 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 82b08a1c8b..4c7f5d5ebd 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 faadb555b1..97b222a9e8 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 |