From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Wed, 6 May 2026 09:06:48 +0000 (+0100)
Subject: test: bump timeout in TEST-07-PID1.socket-on-failure
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6ee724ac82042f92eace0d6c015dd9681122bf5;p=thirdparty%2Fsystemd.git

test: bump timeout in TEST-07-PID1.socket-on-failure

The timeout is too short so under sanitizers the test sometimes fails:

[ 3502.317855] TEST-07-PID1.sh[16212]: + mkdir -p /tmp/TEST-07-PID1-socket-29942
[ 3502.317855] TEST-07-PID1.sh[16212]: + cat
[ 3502.317855] TEST-07-PID1.sh[16212]: + cat
[ 3502.317855] TEST-07-PID1.sh[16212]: + cat
[ 3502.317855] TEST-07-PID1.sh[16212]: + systemctl start TEST-07-PID1-socket-29942.socket
[ 3502.317855] TEST-07-PID1.sh[16212]: + systemctl is-active TEST-07-PID1-socket-29942.socket
[ 3502.319398] TEST-07-PID1.sh[16221]: active
[ 3502.319758] TEST-07-PID1.sh[16212]: + [[ -S /tmp/TEST-07-PID1-socket-29942/test ]]
[ 3502.319758] TEST-07-PID1.sh[16212]: + systemctl stop TEST-07-PID1-socket-29942.socket
[ 3502.319758] TEST-07-PID1.sh[16212]: + rm /tmp/TEST-07-PID1-socket-29942/test
[ 3502.319758] TEST-07-PID1.sh[16212]: + chattr +i /tmp/TEST-07-PID1-socket-29942
[ 3502.320499] TEST-07-PID1.sh[16227]: + systemctl start TEST-07-PID1-socket-29942.socket
[ 3502.320914] TEST-07-PID1.sh[16228]: Job failed. See "journalctl -xe" for details.
[ 3502.321560] TEST-07-PID1.sh[16212]: + systemctl is-failed TEST-07-PID1-socket-29942.socket
[ 3502.321856] TEST-07-PID1.sh[16230]: failed
[ 3502.322315] TEST-07-PID1.sh[16233]: ++ systemctl show TEST-07-PID1-socket-29942.socket -P SubState
[ 3502.322722] TEST-07-PID1.sh[16212]: + assert_eq failed failed
[ 3502.323111] TEST-07-PID1.sh[16235]: + set +ex
[ 3502.323512] TEST-07-PID1.sh[16212]: + [[ ! -e /tmp/TEST-07-PID1-socket-29942/test ]]
[ 3502.323512] TEST-07-PID1.sh[16212]: + timeout 10 bash -c 'until systemctl is-failed TEST-07-PID1-socket-OnFailure.service; do sleep .5; done'
[ 3502.323949] TEST-07-PID1.sh[16238]: activating
[ 3502.324376] TEST-07-PID1.sh[16241]: activating
[ 3502.324754] TEST-07-PID1.sh[16244]: activating
[ 3502.325164] TEST-07-PID1.sh[16247]: activating
[ 3502.325587] TEST-07-PID1.sh[16250]: activating
[ 3502.325938] TEST-07-PID1.sh[16253]: activating
[ 3502.326393] TEST-07-PID1.sh[16256]: activating
[ 3502.326791] TEST-07-PID1.sh[16259]: activating
[ 3502.327180] TEST-07-PID1.sh[16262]: activating
[ 3502.327558] TEST-07-PID1.sh[16265]: activating
[ 3502.327971] TEST-07-PID1.sh[16268]: activating
[ 3502.328409] TEST-07-PID1.sh[16212]: + at_exit
[ 3502.328409] TEST-07-PID1.sh[16212]: + systemctl stop TEST-07-PID1-socket-29942.socket
[ 3502.328409] TEST-07-PID1.sh[16212]: + rm -f /run/systemd/system/TEST-07-PID1-socket-29942.socket /run/systemd/system/TEST-07-PID1-socket-29942.service /run/systemd/system/TEST-07-PID1-socket-OnFailure.service
[ 3502.328945] TEST-07-PID1.sh[147]: + echo 'Subtest /usr/lib/systemd/tests/testdata/units/TEST-07-PID1.socket-on-failure.sh failed'

Bump from 10s to 60s to try and make it less flaky
---

diff --git a/test/units/TEST-07-PID1.socket-on-failure.sh b/test/units/TEST-07-PID1.socket-on-failure.sh
index affcec44ff2..44b8a43634f 100755
--- a/test/units/TEST-07-PID1.socket-on-failure.sh
+++ b/test/units/TEST-07-PID1.socket-on-failure.sh
@@ -55,7 +55,7 @@ systemctl is-failed "$UNIT_NAME.socket"
 assert_eq "$(systemctl show "$UNIT_NAME.socket" -P SubState)" "failed"
 
 [[ ! -e "/tmp/$UNIT_NAME/test" ]]
-timeout 10 bash -c "until systemctl is-failed TEST-07-PID1-socket-OnFailure.service; do sleep .5; done"
+timeout --foreground 60 bash -c "until systemctl is-failed TEST-07-PID1-socket-OnFailure.service; do sleep .5; done"
 
 chattr -i "/tmp/$UNIT_NAME"
 
@@ -65,7 +65,7 @@ mkdir "/tmp/$UNIT_NAME/test"
 systemctl is-failed "$UNIT_NAME.socket"
 assert_eq "$(systemctl show "$UNIT_NAME.socket" -P SubState)" "failed"
 
-timeout 10 bash -c "while [[ -d '/tmp/$UNIT_NAME/test' ]]; do sleep .5; done"
+timeout --foreground 60 bash -c "while [[ -d '/tmp/$UNIT_NAME/test' ]]; do sleep .5; done"
 [[ ! -e "/tmp/$UNIT_NAME/test" ]]
 systemctl is-active TEST-07-PID1-socket-OnFailure.service