dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

test: "prettify" the test a bit

Browse Source
This commit is contained in:
Frantisek Sumsal
2023-11-07 14:35:06 +01:00
parent b3e199cec8
commit 41e4ce06fe
1 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
test/units/testsuite-45.sh
View File

@@ -208,19 +208,34 @@ assert_ntp() {
assert_eq "$(busctl get-property org.freedesktop.timedate1 /org/freedesktop/timedate1 org.freedesktop.timedate1 NTP)" "b $1" assert_eq "$(busctl get-property org.freedesktop.timedate1 /org/freedesktop/timedate1 org.freedesktop.timedate1 NTP)" "b $1"
} }
start_mon() { assert_timedated_signal() {
busctl monitor --match="type='signal',sender=org.freedesktop.timedate1,member='PropertiesChanged',path=/org/freedesktop/timedate1" >"$mon" & local timestamp="${1:?}"
MONPID=$! local value="${2:?}"
local args=(-q -n 1 --since="$timestamp" -p info _SYSTEMD_UNIT="busctl-monitor.service")
journalctl --sync
for _ in {0..9}; do
if journalctl "${args[@]}" --grep .; then
[[ "$(journalctl "${args[@]}" -o cat | tr -d '\n' | jq -r '.payload.data[1].NTP.data')" == "$value" ]];
return 0
fi
sleep .5
done
return 1
} }
wait_mon() { assert_timesyncd_state() {
for i in {1..10}; do local state="${1:?}"
(( i > 1 )) && sleep 1
if grep -q "$1" "$mon"; then break; fi for _ in {0..9}; do
[[ "$(systemctl show systemd-timesyncd.service -P ActiveState)" == "$state" ]] && return 0
sleep .5
done done
assert_in "$2" "$(cat "$mon")"
kill "$MONPID" return 1
wait "$MONPID" 2>/dev/null || true
} }
testcase_ntp() { testcase_ntp() {
@@ -241,40 +256,31 @@ EOF
systemctl daemon-reload systemctl daemon-reload
fi fi
mon=$(mktemp -t dbusmon.XXXXXX) systemd-run --unit busctl-monitor.service --service-type=exec \
busctl monitor --json=short --match="type='signal',sender=org.freedesktop.timedate1,member='PropertiesChanged',path=/org/freedesktop/timedate1"
echo 'disable NTP' : 'Disable NTP'
timedatectl set-ntp false timedatectl set-ntp false
for i in {1..10}; do assert_timesyncd_state "inactive"
(( i > 1 )) && sleep 1
if [[ "$(systemctl show systemd-timesyncd --property ActiveState)" == "ActiveState=inactive" ]]; then
break;
fi
done
assert_eq "$(systemctl show systemd-timesyncd --property ActiveState)" "ActiveState=inactive"
assert_ntp "false" assert_ntp "false"
assert_rc 3 systemctl is-active --quiet systemd-timesyncd assert_rc 3 systemctl is-active --quiet systemd-timesyncd
echo 'enable NTP' : 'Enable NTP'
start_mon ts="$(date +"%F %T.%6N")"
timedatectl set-ntp true timedatectl set-ntp true
wait_mon "NTP" "BOOLEAN true" assert_timedated_signal "$ts" "true"
assert_ntp "true" assert_ntp "true"
for i in {1..10}; do assert_timesyncd_state "active"
(( i > 1 )) && sleep 1
if [[ "$(systemctl show systemd-timesyncd --property ActiveState)" == "ActiveState=active" ]]; then
break;
fi
done
assert_eq "$(systemctl show systemd-timesyncd --property ActiveState)" "ActiveState=active"
assert_rc 0 systemctl is-active --quiet systemd-timesyncd assert_rc 0 systemctl is-active --quiet systemd-timesyncd
echo 're-disable NTP' : 'Re-disable NTP'
start_mon ts="$(date +"%F %T.%6N")"
timedatectl set-ntp false timedatectl set-ntp false
wait_mon "NTP" "BOOLEAN false" assert_timedated_signal "$ts" "false"
assert_ntp "false" assert_ntp "false"
assert_rc 3 systemctl is-active --quiet systemd-timesyncd assert_rc 3 systemctl is-active --quiet systemd-timesyncd
systemctl stop busctl-monitor.service
} }
run_testcases run_testcases