picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test: drop redirection to tty in integration tests 

I *think* this was originally added to make it easier to see what was happening
in tests. Later we added the functionality to print the journal on failure, so
this redirection has stopped being useful.

In https://github.com/systemd/systemd/pull/13719#issuecomment-539292650
@filbranden shows that grep tries to write to stdout and fails. In general,
we should not assume that writing to the console it always possible. We have
special code to handle this in pid1 after all:

99    19:22:10.731965 fstat(1,  <unfinished ...>
99    19:22:10.731993 <... fstat resumed>{st_mode=S_IFCHR|0620, st_rdev=makedev(0x88, 0), ...}) = 0
99    19:22:10.732070 write(1, "ExecStartPost={ path=/bin/echo ; argv[]=/bin/echo ${4_four_ex} ; ignore_errors=no ; start_time=[Mon 2019-10-07 19:22:10 PDT] ; stop_time=[Mon 209-10-07 19:22:10 PDT] ; pid=97 ; code=exited ; status=0 }\n", 203) = -1 EIO (Input/output error)
99    19:22:10.732174 write(2, "grep: ", 6) = -1 EIO (Input/output error)
99    19:22:10.732226 write(2, "write error", 11) = -1 EIO (Input/output error)
99    19:22:10.732263 write(2, ": Input/output error", 20) = -1 EIO (Input/output error)
99    19:22:10.732298 write(2, "\n", 1 <unfinished ...>
99    19:22:10.732325 <... write resumed>) = -1 EIO (Input/output error)
99    19:22:10.732349 exit_group(2)     = ?
99    19:22:10.732424 +++ exited with 2 +++

Removing the redirection should make the tests less flakey.

Replaces #13719.

While at it, also drop NotifyAccess=all. I think it was added purposefully in
TEST-20-MAINPIDGAMES, and then cargo culted to newer tests.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-10-08 08:45:12 +02:00
parent 581004bd33
commit 0f714a34c4
21 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/TEST-03-JOBS/test.sh
View File

@ -32,8 +32,6 @@ After=multi-user.target
[Service]
ExecStart=/test-jobs.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
EOF
# copy the units used by this test

2
test/TEST-10-ISSUE-2467/test.sh
View File

@ -22,8 +22,6 @@ Description=Testsuite service
[Service]
Type=oneshot
StandardOutput=tty
StandardError=tty
ExecStart=/bin/sh -e -x -c 'rm -f /tmp/nonexistent; systemctl start test.socket; printf x > test.file; socat -t20 OPEN:test.file UNIX-CONNECT:/run/test.ctl; >/testok'
EOF

2
test/TEST-13-NSPAWN-SMOKE/test.sh
View File

@ -37,8 +37,6 @@ Description=Testsuite service
[Service]
ExecStart=/test-nspawn.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
EOF
cat >$initdir/test-nspawn.sh <<'EOF'

2
test/TEST-17-UDEV-WANTS/test.sh
View File

@ -30,8 +30,6 @@ Description=Testsuite service
[Service]
ExecStart=/bin/bash -x /testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
EOF
cp testsuite.sh $initdir/

2
test/TEST-18-FAILUREACTION/test.sh
View File

@ -22,8 +22,6 @@ Description=Testsuite service
[Service]
ExecStart=/bin/bash -x /testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
EOF
cp testsuite.sh $initdir/

2
test/TEST-19-DELEGATE/test.sh
View File

@ -32,8 +32,6 @@ Description=Testsuite service
[Service]
ExecStart=/bin/bash -x /testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
EOF
cp testsuite.sh $initdir/

2
test/TEST-20-MAINPIDGAMES/test.sh
View File

@ -29,8 +29,6 @@ Description=Testsuite service
[Service]
ExecStart=/bin/bash -x /testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
NotifyAccess=all
EOF
cp testsuite.sh $initdir/

3
test/TEST-23-TYPE-EXEC/test.sh
View File

@ -29,9 +29,6 @@ Description=Testsuite service
[Service]
ExecStart=/testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
NotifyAccess=all
EOF
cp testsuite.sh $initdir/

3
test/TEST-25-IMPORT/test.sh
View File

@ -22,9 +22,6 @@ Description=Testsuite service
[Service]
ExecStart=/testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
NotifyAccess=all
EOF
cp testsuite.sh $initdir/

3
test/TEST-26-SETENV/test.sh
View File

@ -21,9 +21,6 @@ Description=Testsuite service
[Service]
ExecStart=/bin/bash -x /testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
NotifyAccess=all
EOF
cp testsuite.sh $initdir/

3
test/TEST-27-STDOUTFILE/test.sh
View File

@ -31,9 +31,6 @@ Description=Testsuite service
[Service]
ExecStart=/testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
NotifyAccess=all
EOF
cp testsuite.sh $initdir/

2
test/TEST-29-UDEV-ID_RENAMING/test.sh
View File

@ -30,8 +30,6 @@ Description=Testsuite service
[Service]
ExecStart=/bin/bash -x /testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
EOF
cp testsuite.sh $initdir/

3
test/TEST-30-ONCLOCKCHANGE/test.sh
View File

@ -40,9 +40,6 @@ Description=Testsuite service
[Service]
ExecStart=/testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
NotifyAccess=all
EOF
cp testsuite.sh $initdir/

2
test/TEST-31-DEVICE-ENUMERATION/test.sh
View File

@ -30,8 +30,6 @@ Description=Testsuite service
[Service]
ExecStart=/bin/bash -x /testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
EOF
cp testsuite.sh $initdir/

2
test/TEST-32-OOMPOLICY/test.sh
View File

@ -32,8 +32,6 @@ Description=Testsuite service
[Service]
ExecStart=/testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
MemoryAccounting=yes
EOF
cp testsuite.sh $initdir/

2
test/TEST-33-CLEAN-UNIT/test.sh
View File

@ -31,8 +31,6 @@ Description=Testsuite service
[Service]
ExecStart=/bin/bash -x /testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
EOF
cp testsuite.sh $initdir/

3
test/TEST-34-DYNAMICUSERMIGRATE/test.sh
View File

@ -29,9 +29,6 @@ Description=Testsuite service
[Service]
ExecStart=/bin/bash -x /testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
NotifyAccess=all
EOF
cp testsuite.sh $initdir/

3
test/TEST-36-NUMAPOLICY/test.sh
View File

@ -33,9 +33,6 @@ Description=Testsuite service
[Service]
ExecStart=/bin/bash -x /testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
NotifyAccess=all
EOF
cp testsuite.sh $initdir/

2
test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh
View File

@ -31,8 +31,6 @@ Description=Testsuite service
[Service]
ExecStart=/bin/bash -x /testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
EOF
cp testsuite.sh $initdir/

3
test/TEST-39-EXECRELOAD/test.sh
View File

@ -31,9 +31,6 @@ Description=Testsuite service
[Service]
ExecStart=/bin/bash -x /testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
NotifyAccess=all
EOF
cp testsuite.sh $initdir/

3
test/TEST-40-EXEC-COMMAND-EX/test.sh
View File

@ -29,9 +29,6 @@ Description=Testsuite service
[Service]
ExecStart=/testsuite.sh
Type=oneshot
StandardOutput=tty
StandardError=tty
NotifyAccess=all
EOF
cp testsuite.sh $initdir/