SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: CET/EET are deprecated, use Europe/Berlin and Kyiv

Browse Source 
The links moved to the legacy dataset so they won't be available by
default, so stop using them and just use the city ones instead
This commit is contained in:
Luca Boccassi
2024-10-21 21:37:33 +02:00
committed by Lennart Poettering
parent e8fb0643c1
commit aa077884c1
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-calendarspec.c
+11 -11
View File
@@ -185,18 +185,18 @@ TEST(calendar_spec_one) {
TEST(calendar_spec_next) {
test_next("2016-03-27 03:17:00", "", 12345, 1459048620000000);
test_next("2016-03-27 03:17:00", "CET", 12345, 1459041420000000);
test_next("2016-03-27 03:17:00", "EET", 12345, -1);
test_next("2016-03-27 03:17:00", "Europe/Berlin", 12345, 1459041420000000);
test_next("2016-03-27 03:17:00", "Europe/Kyiv", 12345, -1);
test_next("2016-03-27 03:17:00 UTC", NULL, 12345, 1459048620000000);
test_next("2016-03-27 03:17:00 UTC", "", 12345, 1459048620000000);
test_next("2016-03-27 03:17:00 UTC", "CET", 12345, 1459048620000000);
test_next("2016-03-27 03:17:00 UTC", "EET", 12345, 1459048620000000);
test_next("2016-03-27 03:17:00.420000001 UTC", "EET", 12345, 1459048620420000);
test_next("2016-03-27 03:17:00.4200005 UTC", "EET", 12345, 1459048620420001);
test_next("2015-11-13 09:11:23.42", "EET", 12345, 1447398683420000);
test_next("2015-11-13 09:11:23.42/1.77", "EET", 1447398683420000, 1447398685190000);
test_next("2015-11-13 09:11:23.42/1.77", "EET", 1447398683419999, 1447398683420000);
test_next("Sun 16:00:00", "CET", 1456041600123456, 1456066800000000);
test_next("2016-03-27 03:17:00 UTC", "Europe/Berlin", 12345, 1459048620000000);
test_next("2016-03-27 03:17:00 UTC", "Europe/Kyiv", 12345, 1459048620000000);
test_next("2016-03-27 03:17:00.420000001 UTC", "Europe/Kyiv", 12345, 1459048620420000);
test_next("2016-03-27 03:17:00.4200005 UTC", "Europe/Kyiv", 12345, 1459048620420001);
test_next("2015-11-13 09:11:23.42", "Europe/Kyiv", 12345, 1447398683420000);
test_next("2015-11-13 09:11:23.42/1.77", "Europe/Kyiv", 1447398683420000, 1447398685190000);
test_next("2015-11-13 09:11:23.42/1.77", "Europe/Kyiv", 1447398683419999, 1447398683420000);
test_next("Sun 16:00:00", "Europe/Berlin", 1456041600123456, 1456066800000000);
test_next("*-04-31", "", 12345, -1);
test_next("2016-02~01 UTC", "", 12345, 1456704000000000);
test_next("Mon 2017-05~01..07 UTC", "", 12345, 1496016000000000);
@@ -215,7 +215,7 @@ TEST(calendar_spec_next) {
test_next("2017-04-02 03:30:00 Pacific/Auckland", "", 12345, 1491060600000000);
/* Confirm that timezones in the Spec work regardless of current timezone */
test_next("2017-09-09 20:42:00 Pacific/Auckland", "", 12345, 1504946520000000);
test_next("2017-09-09 20:42:00 Pacific/Auckland", "EET", 12345, 1504946520000000);
test_next("2017-09-09 20:42:00 Pacific/Auckland", "Europe/Kyiv", 12345, 1504946520000000);
/* Check that we don't start looping if mktime() moves us backwards */
test_next("Sun *-*-* 01:00:00 Europe/Dublin", "", 1616412478000000, 1617494400000000);
test_next("Sun *-*-* 01:00:00 Europe/Dublin", "IST", 1616412478000000, 1617494400000000);
test/test-functions
-2
View File
@@ -2258,8 +2258,6 @@ install_zoneinfo() {
inst_any /usr/share/zoneinfo/Europe/Kyiv
inst_any /usr/share/zoneinfo/Pacific/Auckland
inst_any /usr/share/zoneinfo/Pacific/Honolulu
inst_any /usr/share/zoneinfo/CET
inst_any /usr/share/zoneinfo/EET
inst_any /usr/share/zoneinfo/UTC
}
test/units/TEST-65-ANALYZE.sh
-1
View File
@@ -174,7 +174,6 @@ systemd-analyze timestamp -- -1
systemd-analyze timestamp yesterday now tomorrow
systemd-analyze timestamp 'Fri 2012-11-23 23:02:15'
systemd-analyze timestamp 'Fri 2012-11-23 23:02:15 UTC'
systemd-analyze timestamp 'Fri 2012-11-23 23:02:15 CET'
for i in $(timedatectl list-timezones); do
[[ -e "/usr/share/zoneinfo/$i" ]] || continue
systemd-analyze timestamp "Fri 2012-11-23 23:02:15 $i"
test/units/TEST-74-AUX-UTILS.firstboot.sh
+3 -3
View File
@@ -132,7 +132,7 @@ systemd-firstboot --root="$ROOT" \
--locale=locale-overwrite \
--locale-messages=messages-overwrite \
--keymap=keymap-overwrite \
--timezone=CET \
--timezone=Europe/Berlin \
--hostname=hostname-overwrite \
--machine-id=bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb \
--root-password-hashed="$ROOT_HASHED_PASSWORD2" \
@@ -153,7 +153,7 @@ systemd-firstboot --root="$ROOT" --force \
--locale=locale-overwrite \
--locale-messages=messages-overwrite \
--keymap=keymap-overwrite \
--timezone=CET \
--timezone=Europe/Berlin \
--hostname=hostname-overwrite \
--machine-id=bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb \
--root-password-hashed="$ROOT_HASHED_PASSWORD2" \
@@ -162,7 +162,7 @@ systemd-firstboot --root="$ROOT" --force \
grep -q "LANG=locale-overwrite" "$ROOT$LOCALE_PATH"
grep -q "LC_MESSAGES=messages-overwrite" "$ROOT$LOCALE_PATH"
grep -q "KEYMAP=keymap-overwrite" "$ROOT/etc/vconsole.conf"
readlink "$ROOT/etc/localtime" | grep -q "/CET$"
readlink "$ROOT/etc/localtime" | grep -q "/Europe/Berlin$"
grep -q "hostname-overwrite" "$ROOT/etc/hostname"
grep -q "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" "$ROOT/etc/machine-id"
grep -q "^root:x:0:0:.*:/bin/barshell$" "$ROOT/etc/passwd"