From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 1 Jul 2021 10:16:56 +0000 (+0000)
Subject: test-time-util: skip missing timezones
X-Git-Tag: v249-rc3~4^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc9849b1e568ed0c16e1b5e2c7f22e2f10ae65aa;p=thirdparty%2Fsystemd.git

test-time-util: skip missing timezones

Fixes #20089. This is essentially a packaging bug in CentOS: the
db lists a timezone which is not present in /usr/share/zoneinfo.
Let's skip this gracefully.
---

diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c
index ee4d20449f1..0ca9beeb518 100644
--- a/src/test/test-time-util.c
+++ b/src/test/test-time-util.c
@@ -273,8 +273,9 @@ static void test_get_timezones(void) {
         assert_se(r == 0);
 
         STRV_FOREACH(zone, zones) {
-                log_info("zone: %s", *zone);
-                assert_se(timezone_is_valid(*zone, LOG_ERR));
+                r = verify_timezone(*zone, LOG_ERR);
+                log_debug_errno(r, "verify_timezone(\"%s\"): %m", *zone);
+                assert_se(r >= 0 || r == -ENOENT);
         }
 }