From c603c6cb569f0900ddf07f0311ffa038a242fac8 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Mon, 29 Sep 2025 16:11:27 +0200 Subject: [PATCH] test: store and compare just the property value Follow-up for 5730a400fd5ee82566fe03eb832121a0d4bc26b6. (cherry picked from commit 0cb252d50f35256bff569fa6213784f2d45ad6a1) Related: RHEL-118215 --- test/units/testsuite-53.restart-trigger.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/units/testsuite-53.restart-trigger.sh b/test/units/testsuite-53.restart-trigger.sh index 057f379ddc..e5cd575d66 100755 --- a/test/units/testsuite-53.restart-trigger.sh +++ b/test/units/testsuite-53.restart-trigger.sh @@ -45,15 +45,15 @@ assert_eq "$(journalctl -q -p info --since="@$JOURNAL_TS" --unit="$UNIT_NAME" -- # Restarting the timer unit shouldn't trigger neither the timer nor the service, so these # fields should remain constant through the following tests -SERVICE_INV_ID="$(systemctl show --property=InvocationID "$UNIT_NAME.service")" -TIMER_LAST_TRIGGER="$(systemctl show --property=LastTriggerUSec "$UNIT_NAME.timer")" +SERVICE_INV_ID="$(systemctl show -P InvocationID "$UNIT_NAME.service")" +TIMER_LAST_TRIGGER="$(systemctl show -P LastTriggerUSec "$UNIT_NAME.timer")" # Now restart the timer and check if the timer and the service weren't triggered again systemctl restart "$UNIT_NAME.timer" sleep 5 assert_eq "$(journalctl -q -p info --since="@$JOURNAL_TS" --unit="$UNIT_NAME" --grep="$TEST_MESSAGE" | wc -l)" "1" -assert_eq "$SERVICE_INV_ID" "$(systemctl show --property=InvocationID "$UNIT_NAME.service")" -assert_eq "$TIMER_LAST_TRIGGER" "$(systemctl show --property=LastTriggerUSec "$UNIT_NAME.timer")" +assert_eq "$SERVICE_INV_ID" "$(systemctl show -P InvocationID "$UNIT_NAME.service")" +assert_eq "$TIMER_LAST_TRIGGER" "$(systemctl show -P LastTriggerUSec "$UNIT_NAME.timer")" # Set the timer into the past, restart it, and again check if it wasn't triggered TIMER_TS="$(date --date="-1 day" "+%Y-%m-%d %H:%M:%S")" @@ -68,8 +68,8 @@ assert_in "OnCalendar=$TIMER_TS" "$(systemctl show -P TimersCalendar "$UNIT_NAME systemctl restart "$UNIT_NAME.timer" sleep 5 assert_eq "$(journalctl -q -p info --since="@$JOURNAL_TS" --unit="$UNIT_NAME" --grep="$TEST_MESSAGE" | wc -l)" "1" -assert_eq "$SERVICE_INV_ID" "$(systemctl show --property=InvocationID "$UNIT_NAME.service")" -assert_eq "$TIMER_LAST_TRIGGER" "$(systemctl show --property=LastTriggerUSec "$UNIT_NAME.timer")" +assert_eq "$SERVICE_INV_ID" "$(systemctl show -P InvocationID "$UNIT_NAME.service")" +assert_eq "$TIMER_LAST_TRIGGER" "$(systemctl show -P LastTriggerUSec "$UNIT_NAME.timer")" # Cleanup systemctl stop "$UNIT_NAME".{timer,service}