morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

test: drop remaining console output

Browse Source 
Follow-up for fa6f37c043.

Partially reverts d5ab23aa54 and
3540ce8587.
This commit is contained in:
Yu Watanabe
2023-11-27 05:59:56 +09:00
parent 24baa46289
commit a97d617f18
6 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/testsuite-80.units/fdstore-nopin.service
View File

@@ -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

2
test/testsuite-80.units/fdstore-pin.service
View File

@@ -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

1
test/units/autorelabel.service
View File

@@ -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

2
test/units/testsuite-75.service
View File

@@ -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

2
test/units/testsuite-80.service
View File

@@ -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

2
test/units/testsuite-80.sh
View File

@@ -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