From: Yu Watanabe Date: Fri, 3 Mar 2023 03:07:25 +0000 (+0900) Subject: test: clear tzname[] after timezone is changed X-Git-Tag: v254-rc1~1127^2~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8677fdc78bf252bf8f35cf20791ad11f1c5fcfff;p=thirdparty%2Fsystemd.git test: clear tzname[] after timezone is changed Fixes the issue reported in fe56f21ae3943e79ce9faeb40b79c7093c50e644. --- diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c index cd4d635dfab..cec5bffd79a 100644 --- a/src/test/test-time-util.c +++ b/src/test/test-time-util.c @@ -707,6 +707,7 @@ TEST(parse_timestamp) { test_parse_timestamp_one("70-01-01 09:00:01.0010 JST", 0, USEC_PER_SEC + 1000); assert_se(set_unset_env("TZ", saved_tz, true) == 0); + tzset(); } if (timezone_is_valid("America/New_York", LOG_DEBUG)) { @@ -756,6 +757,7 @@ TEST(parse_timestamp) { test_parse_timestamp_one("69-12-31 19:00:01.0010 EST", 0, USEC_PER_SEC + 1000); assert_se(set_unset_env("TZ", saved_tz, true) == 0); + tzset(); } /* -06 */ @@ -823,13 +825,12 @@ TEST(parse_timestamp) { /* without date */ assert_se(parse_timestamp("today", &today) == 0); - // FIXME: currently failing, needs to investigate the changes from https://github.com/systemd/systemd/pull/26409 - /*test_parse_timestamp_one("00:01", 0, today + USEC_PER_MINUTE); + test_parse_timestamp_one("00:01", 0, today + USEC_PER_MINUTE); test_parse_timestamp_one("00:00:01", 0, today + USEC_PER_SEC); test_parse_timestamp_one("00:00:01.001", 0, today + USEC_PER_SEC + 1000); test_parse_timestamp_one("00:00:01.0010", 0, today + USEC_PER_SEC + 1000); test_parse_timestamp_one("tomorrow", 0, today + USEC_PER_DAY); - test_parse_timestamp_one("yesterday", 0, today - USEC_PER_DAY);*/ + test_parse_timestamp_one("yesterday", 0, today - USEC_PER_DAY); /* relative */ assert_se(parse_timestamp("now", &now_usec) == 0);