shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-31 14:50:15 +03:00
Code

Merge pull request #13795 from ddstreet/test-41

Browse Source 
WIP: test: debug TEST-41 failure on Ubuntu CI
This commit is contained in:
Anita Zhang 2019-10-18 18:36:48 -07:00 committed by GitHub
commit d2fc7d22cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/TEST-41-ONESHOT-RESTART/blacklist-ubuntu-ci
View File

@ -1,4 +0,0 @@
This appears to be failing on Ubuntu CI due to short sleep duration
waiting for the service-restarts to complete, but doubling the
sleep from 5 to 10 seconds didn't appear to help, so let's blacklist
this on Ubuntu CI while debugging the test failure.

26
test/TEST-41-ONESHOT-RESTART/testsuite.sh
View File

@ -2,14 +2,19 @@
set -ex
set -o pipefail
# wait this many secs for each test service to succeed in what is being tested
MAX_SECS=60
systemd-analyze log-level debug
systemd-analyze log-target console
# These three commands should succeed.
# test one: Restart=on-failure should restart the service
! systemd-run --unit=one -p Type=oneshot -p Restart=on-failure /bin/bash -c "exit 1"
sleep 5
for ((secs=0; secs<$MAX_SECS; secs++)); do
[[ "$(systemctl show one.service -p NRestarts --value)" -le 0 ]] || break
sleep 1
done
if [[ "$(systemctl show one.service -p NRestarts --value)" -le 0 ]]; then
exit 1
fi
@ -18,10 +23,21 @@ TMP_FILE="/test-41-oneshot-restart-test"
touch $TMP_FILE
! systemd-run --unit=two -p StartLimitBurst=3 -p Type=oneshot -p Restart=on-failure -p ExecStart="/bin/bash -c \"printf a >> $TMP_FILE\"" /bin/bash -c "exit 1"
# test two: make sure StartLimitBurst correctly limits the number of restarts
# and restarts execution of the unit from the first ExecStart=
! systemd-run --unit=two -p StartLimitIntervalSec=120 -p StartLimitBurst=3 -p Type=oneshot -p Restart=on-failure -p ExecStart="/bin/bash -c \"printf a >> $TMP_FILE\"" /bin/bash -c "exit 1"
# wait for at least 3 restarts
for ((secs=0; secs<$MAX_SECS; secs++)); do
[[ $(cat $TMP_FILE) != "aaa" ]] || break
sleep 1
done
if [[ $(cat $TMP_FILE) != "aaa" ]]; then
exit 1
fi
# wait for 5 more seconds to make sure there aren't excess restarts
sleep 5
if [[ $(cat $TMP_FILE) != "aaa" ]]; then
exit 1
fi