2169d2c18c
Resolves: RHEL-108555,RHEL-108568,RHEL-108576,RHEL-108584,RHEL-108596,RHEL-108598,RHEL-109096,RHEL-109488,RHEL-111065,RHEL-31756,RHEL-50103
93 lines
3.5 KiB
Diff
93 lines
3.5 KiB
Diff
From 03dff755efde1a311969636e11fe95c398b7d878 Mon Sep 17 00:00:00 2001
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
Date: Fri, 3 Mar 2023 19:40:40 +0900
|
|
Subject: [PATCH] test: use get_timezones() to iterate all known timezones
|
|
|
|
(cherry picked from commit 0b20d70d1c7c190fb943dd4d1f28e6f456d2193e)
|
|
|
|
Related: RHEL-109488
|
|
---
|
|
src/test/test-time-util.c | 50 +++++++++------------------------------
|
|
1 file changed, 11 insertions(+), 39 deletions(-)
|
|
|
|
diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c
|
|
index 56a71ecfba..eb8cc538c0 100644
|
|
--- a/src/test/test-time-util.c
|
|
+++ b/src/test/test-time-util.c
|
|
@@ -1,6 +1,5 @@
|
|
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
|
|
|
-#include "dirent-util.h"
|
|
#include "env-util.h"
|
|
#include "fd-util.h"
|
|
#include "fileio.h"
|
|
@@ -414,23 +413,18 @@ TEST(FORMAT_TIMESTAMP) {
|
|
test_format_timestamp_loop();
|
|
}
|
|
|
|
-static void test_format_timestamp_with_tz_one(const char *name1, const char *name2) {
|
|
- _cleanup_free_ char *buf = NULL, *tz = NULL;
|
|
- const char *name, *saved_tz;
|
|
-
|
|
- if (name2)
|
|
- assert_se(buf = path_join(name1, name2));
|
|
- name = buf ?: name1;
|
|
+static void test_format_timestamp_with_tz_one(const char *tz) {
|
|
+ const char *saved_tz, *colon_tz;
|
|
|
|
- if (!timezone_is_valid(name, LOG_DEBUG))
|
|
+ if (!timezone_is_valid(tz, LOG_DEBUG))
|
|
return;
|
|
|
|
- log_info("/* %s(%s) */", __func__, name);
|
|
+ log_info("/* %s(%s) */", __func__, tz);
|
|
|
|
saved_tz = getenv("TZ");
|
|
|
|
- assert_se(tz = strjoin(":", name));
|
|
- assert_se(setenv("TZ", tz, 1) >= 0);
|
|
+ assert_se(colon_tz = strjoina(":", tz));
|
|
+ assert_se(setenv("TZ", colon_tz, 1) >= 0);
|
|
tzset();
|
|
log_debug("%s: tzname[0]=%s, tzname[1]=%s", tz, strempty(tzname[0]), strempty(tzname[1]));
|
|
|
|
@@ -441,33 +435,11 @@ static void test_format_timestamp_with_tz_one(const char *name1, const char *nam
|
|
}
|
|
|
|
TEST(FORMAT_TIMESTAMP_with_tz) {
|
|
- if (!slow_tests_enabled())
|
|
- return (void) log_tests_skipped("slow tests are disabled");
|
|
-
|
|
- _cleanup_closedir_ DIR *dir = opendir("/usr/share/zoneinfo");
|
|
- if (!dir)
|
|
- return (void) log_tests_skipped_errno(errno, "Failed to open /usr/share/zoneinfo");
|
|
-
|
|
- FOREACH_DIRENT(de, dir, break) {
|
|
- if (de->d_type == DT_REG)
|
|
- test_format_timestamp_with_tz_one(de->d_name, NULL);
|
|
-
|
|
- else if (de->d_type == DT_DIR) {
|
|
- if (streq(de->d_name, "right"))
|
|
- /* The test does not support timezone with leap second info. */
|
|
- continue;
|
|
-
|
|
- _cleanup_closedir_ DIR *subdir = xopendirat(dirfd(dir), de->d_name, 0);
|
|
- if (!subdir) {
|
|
- log_notice_errno(errno, "Failed to open /usr/share/zoneinfo/%s, ignoring: %m", de->d_name);
|
|
- continue;
|
|
- }
|
|
-
|
|
- FOREACH_DIRENT(subde, subdir, break)
|
|
- if (subde->d_type == DT_REG)
|
|
- test_format_timestamp_with_tz_one(de->d_name, subde->d_name);
|
|
- }
|
|
- }
|
|
+ _cleanup_strv_free_ char **timezones = NULL;
|
|
+
|
|
+ assert_se(get_timezones(&timezones) >= 0);
|
|
+ STRV_FOREACH(tz, timezones)
|
|
+ test_format_timestamp_with_tz_one(*tz);
|
|
}
|
|
|
|
TEST(format_timestamp_relative) {
|