mirror of
https://github.com/systemd/systemd
synced 2024-09-06 00:41:36 +00:00
test: replace Europe/Kiev with Europe/Kyiv
As the former is deprecated and might not be available (i.e. on Ubuntu Noble it's only available after installing the tzdata-legacy package).
This commit is contained in:
parent
2c93e5f002
commit
568d97953b
|
@ -2299,7 +2299,7 @@ install_zoneinfo() {
|
||||||
inst_any /usr/share/zoneinfo/Australia/Sydney
|
inst_any /usr/share/zoneinfo/Australia/Sydney
|
||||||
inst_any /usr/share/zoneinfo/Europe/Berlin
|
inst_any /usr/share/zoneinfo/Europe/Berlin
|
||||||
inst_any /usr/share/zoneinfo/Europe/Dublin
|
inst_any /usr/share/zoneinfo/Europe/Dublin
|
||||||
inst_any /usr/share/zoneinfo/Europe/Kiev
|
inst_any /usr/share/zoneinfo/Europe/Kyiv
|
||||||
inst_any /usr/share/zoneinfo/Pacific/Auckland
|
inst_any /usr/share/zoneinfo/Pacific/Auckland
|
||||||
inst_any /usr/share/zoneinfo/Pacific/Honolulu
|
inst_any /usr/share/zoneinfo/Pacific/Honolulu
|
||||||
inst_any /usr/share/zoneinfo/CET
|
inst_any /usr/share/zoneinfo/CET
|
||||||
|
|
|
@ -16,7 +16,7 @@ systemd-run --on-clock-change touch /tmp/clock-changed
|
||||||
test ! -f /tmp/timezone-changed
|
test ! -f /tmp/timezone-changed
|
||||||
test ! -f /tmp/clock-changed
|
test ! -f /tmp/clock-changed
|
||||||
|
|
||||||
timedatectl set-timezone Europe/Kiev
|
timedatectl set-timezone Europe/Kyiv
|
||||||
|
|
||||||
while test ! -f /tmp/timezone-changed ; do sleep .5 ; done
|
while test ! -f /tmp/timezone-changed ; do sleep .5 ; done
|
||||||
|
|
||||||
|
|
|
@ -57,12 +57,12 @@ testcase_timezone() {
|
||||||
assert_in "Local time:" "$(timedatectl --no-pager)"
|
assert_in "Local time:" "$(timedatectl --no-pager)"
|
||||||
|
|
||||||
echo 'change timezone'
|
echo 'change timezone'
|
||||||
assert_eq "$(timedatectl --no-pager set-timezone Europe/Kiev 2>&1)" ""
|
assert_eq "$(timedatectl --no-pager set-timezone Europe/Kyiv 2>&1)" ""
|
||||||
assert_eq "$(readlink /etc/localtime | sed 's#^.*zoneinfo/##')" "Europe/Kiev"
|
assert_eq "$(readlink /etc/localtime | sed 's#^.*zoneinfo/##')" "Europe/Kyiv"
|
||||||
if [[ -f /etc/timezone ]]; then
|
if [[ -f /etc/timezone ]]; then
|
||||||
assert_eq "$(cat /etc/timezone)" "Europe/Kiev"
|
assert_eq "$(cat /etc/timezone)" "Europe/Kyiv"
|
||||||
fi
|
fi
|
||||||
assert_in "Time zone: Europe/Kiev \(EES*T, \+0[0-9]00\)" "$(timedatectl)"
|
assert_in "Time zone: Europe/Kyiv \(EES*T, \+0[0-9]00\)" "$(timedatectl)"
|
||||||
|
|
||||||
if [[ -n "$ORIG_TZ" ]]; then
|
if [[ -n "$ORIG_TZ" ]]; then
|
||||||
echo 'reset timezone to original'
|
echo 'reset timezone to original'
|
||||||
|
|
Loading…
Reference in a new issue