From 839db33687e4751f3dd0b210d8b82339c17e7dd7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 20 Dec 2024 15:02:16 +0100 Subject: [PATCH] test-watchdog: modernize --- src/test/test-watchdog.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/test/test-watchdog.c b/src/test/test-watchdog.c index 70d069c08b5..1eb284cd29d 100644 --- a/src/test/test-watchdog.c +++ b/src/test/test-watchdog.c @@ -8,26 +8,24 @@ #include "watchdog.h" int main(int argc, char *argv[]) { - usec_t t; - unsigned i, count; int r; - bool slow; test_setup_logging(LOG_DEBUG); - slow = slow_tests_enabled(); + bool slow = slow_tests_enabled(); - t = slow ? 10 * USEC_PER_SEC : 2 * USEC_PER_SEC; - count = slow ? 5 : 3; + usec_t timeout = slow ? 10 * USEC_PER_SEC : 2 * USEC_PER_SEC; + unsigned count = slow ? 5 : 3; - r = watchdog_setup(t); + log_info("Initializing watchdog with timeout of %s", FORMAT_TIMESPAN(timeout, USEC_PER_SEC)); + r = watchdog_setup(timeout); if (r < 0) log_warning_errno(r, "Failed to open watchdog: %m"); - for (i = 0; i < count; i++) { - t = watchdog_runtime_wait(); - log_info("Sleeping " USEC_FMT " microseconds...", t); - usleep_safe(t); + for (unsigned i = 0; i < count; i++) { + timeout = watchdog_runtime_wait(); + log_info("Sleeping %s…", FORMAT_TIMESPAN(timeout, USEC_PER_SEC)); + usleep_safe(timeout); log_info("Pinging..."); r = watchdog_ping(); if (r < 0) -- 2.47.3