Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4758 from bboozzoo/bboozzoo/timer-services-spread…
…-test wrappers, tests/main/snap-service-timer: restore missing commit, add spread test for timer services
- Loading branch information
Showing
6 changed files
with
132 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
#!/bin/sh | ||
|
||
echo "called on $(date) as $1" | ||
|
||
for _ in $(seq 10); do | ||
echo "looping" | ||
sleep 0.5 | ||
done | ||
|
||
echo "finishing on $(date)" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
name: test-snapd-timer-service | ||
version: 1.0 | ||
apps: | ||
regular-timer: | ||
command: bin/loop regular-timer | ||
daemon: simple | ||
# Run every 15 minutes | ||
timer: 0:00-24:00/96 | ||
random-timer: | ||
command: bin/loop random-timer | ||
daemon: simple | ||
# Run roughly every 15 minutes, with (some) random distribution | ||
timer: 0:00~24:00/96 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
summary: Check that snap timer services work | ||
|
||
execute: | | ||
echo "When the service snap is installed" | ||
. $TESTSLIB/snaps.sh | ||
install_local test-snapd-timer-service | ||
echo "We can see the timers being active" | ||
for service in regular-timer random-timer; do | ||
systemctl show -p ActiveState snap.test-snapd-timer-service.$service.timer | MATCH "ActiveState=active" | ||
systemctl show -p SubState snap.test-snapd-timer-service.$service.timer | MATCH "SubState=waiting" | ||
systemctl show -p Triggers snap.test-snapd-timer-service.$service.timer | \ | ||
MATCH "snap.test-snapd-timer-service.$service.service" | ||
systemctl show -p UnitFileState snap.test-snapd-timer-service.$service.timer | MATCH "UnitFileState=enabled" | ||
done | ||
# systemctl list-timers output: | ||
# NEXT LEFT LAST PASSED UNIT ACTIVATES | ||
# Fri 2018-02-23 11:00:00 CET 3min 25s left Fri 2018-02-23 10:45:36 CET 10min ago snap.timer-service-snap.regular-timer.timer snap.timer-service-snap.regular-timer.service | ||
# Fri 2018-02-23 11:01:00 CET 4min 25s left Fri 2018-02-23 10:51:36 CET 4min 58s ago snap.timer-service-snap.random-timer.timer snap.timer-service-snap.random-timer.service | ||
echo "When disabled, times are not listed by systemd" | ||
snap disable test-snapd-timer-service | ||
if [[ "$SPREAD_SYSTEM" == ubuntu-14.04-* ]]; then | ||
for service in regular-timer random-timer; do | ||
systemctl show -p UnitFileState snap.test-snapd-timer-service.$service.timer | MATCH "UnitFileState=" | ||
done | ||
else | ||
! systemctl list-timers | MATCH "test-snapd-timer-service" | ||
fi | ||
echo "When reenabled, the timers are present again" | ||
snap enable test-snapd-timer-service | ||
if [[ "$SPREAD_SYSTEM" == ubuntu-14.04-* ]]; then | ||
for service in regular-timer random-timer; do | ||
systemctl show -p UnitFileState snap.test-snapd-timer-service.$service.timer | MATCH "UnitFileState=enabled" | ||
done | ||
else | ||
systemctl list-timers | MATCH "test-snapd-timer-service" | ||
fi | ||
echo "When removed, times are not listed by systemd" | ||
snap remove test-snapd-timer-service | ||
if [[ "$SPREAD_SYSTEM" == ubuntu-14.04-* ]]; then | ||
for service in regular-timer random-timer; do | ||
systemctl show -p UnitFileState snap.test-snapd-timer-service.$service.timer | MATCH "UnitFileState=" | ||
done | ||
else | ||
! systemctl list-timers | MATCH "test-snapd-timer-service" | ||
fi | ||
echo "No timer files are left behind" | ||
test $(find /etc/systemd/system -name 'snap.test-snapd-timer-service.*.timer' | wc -l) -eq "0" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters