mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-01-07 17:17:44 +03:00
test: CET/EET are deprecated, use Europe/Berlin and Kyiv
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 (cherry picked from commit aa077884c13769ae3bd6aa98978b4ac9e64b5365) (cherry picked from commit 4a3fc628a24b5f13af350691ff50f8be905c9c9c)
This commit is contained in:
Luca Boccassi
parent
4b00dad416
commit
484cd8584c
@ -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);
|
||||
|
||||
@ -2331,8 +2331,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
|
||||
}
|
||||
|
||||
|
||||
@ -150,7 +150,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"
|
||||
|
||||
@ -110,7 +110,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" \
|
||||
@ -131,7 +131,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" \
|
||||
@ -140,7 +140,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"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user