|
 |
8d419f |
From ce027f67d29066f188891c94447e50c12168a693 Mon Sep 17 00:00:00 2001
|
|
|
8d419f |
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
|
8d419f |
Date: Tue, 14 Jun 2022 09:02:00 +0900
|
|
|
8d419f |
Subject: [PATCH] test: support debian/ubuntu specific timezone config file
|
|
|
8d419f |
|
|
|
8d419f |
(cherry picked from commit aab61a8c990a54703ae70ca951d0502860010267)
|
|
|
8d419f |
|
|
|
8d419f |
Related: #2087652
|
|
|
8d419f |
---
|
|
|
8d419f |
test/units/testsuite-45.sh | 24 ++++++++++++++++++++++++
|
|
|
8d419f |
1 file changed, 24 insertions(+)
|
|
|
8d419f |
|
|
|
8d419f |
diff --git a/test/units/testsuite-45.sh b/test/units/testsuite-45.sh
|
|
|
8d419f |
index 2069d2437f..d0f9dd9461 100755
|
|
|
8d419f |
--- a/test/units/testsuite-45.sh
|
|
|
8d419f |
+++ b/test/units/testsuite-45.sh
|
|
|
8d419f |
@@ -7,9 +7,24 @@ set -o pipefail
|
|
|
8d419f |
# shellcheck source=test/units/assert.sh
|
|
|
8d419f |
. "$(dirname "$0")"/assert.sh
|
|
|
8d419f |
|
|
|
8d419f |
+restore_timezone() {
|
|
|
8d419f |
+ if [[ -f /tmp/timezone.bak ]]; then
|
|
|
8d419f |
+ mv /tmp/timezone.bak /etc/timezone
|
|
|
8d419f |
+ else
|
|
|
8d419f |
+ rm -f /etc/timezone
|
|
|
8d419f |
+ fi
|
|
|
8d419f |
+}
|
|
|
8d419f |
+
|
|
|
8d419f |
test_timezone() {
|
|
|
8d419f |
local ORIG_TZ=
|
|
|
8d419f |
|
|
|
8d419f |
+ # Debian/Ubuntu specific file
|
|
|
8d419f |
+ if [[ -f /etc/timezone ]]; then
|
|
|
8d419f |
+ mv /etc/timezone /tmp/timezone.bak
|
|
|
8d419f |
+ fi
|
|
|
8d419f |
+
|
|
|
8d419f |
+ trap restore_timezone EXIT
|
|
|
8d419f |
+
|
|
|
8d419f |
if [[ -L /etc/localtime ]]; then
|
|
|
8d419f |
ORIG_TZ=$(readlink /etc/localtime | sed 's#^.*zoneinfo/##')
|
|
|
8d419f |
echo "original tz: $ORIG_TZ"
|
|
|
8d419f |
@@ -21,13 +36,22 @@ test_timezone() {
|
|
|
8d419f |
echo 'change timezone'
|
|
|
8d419f |
assert_eq "$(timedatectl --no-pager set-timezone Europe/Kiev 2>&1)" ""
|
|
|
8d419f |
assert_eq "$(readlink /etc/localtime | sed 's#^.*zoneinfo/##')" "Europe/Kiev"
|
|
|
8d419f |
+ if [[ -f /etc/timezone ]]; then
|
|
|
8d419f |
+ assert_eq "$(cat /etc/timezone)" "Europe/Kiev"
|
|
|
8d419f |
+ fi
|
|
|
8d419f |
assert_in "Time zone: Europe/Kiev \(EEST, \+0[0-9]00\)" "$(timedatectl)"
|
|
|
8d419f |
|
|
|
8d419f |
if [[ -n "$ORIG_TZ" ]]; then
|
|
|
8d419f |
echo 'reset timezone to original'
|
|
|
8d419f |
assert_eq "$(timedatectl set-timezone "$ORIG_TZ" 2>&1)" ""
|
|
|
8d419f |
assert_eq "$(readlink /etc/localtime | sed 's#^.*zoneinfo/##')" "$ORIG_TZ"
|
|
|
8d419f |
+ if [[ -f /etc/timezone ]]; then
|
|
|
8d419f |
+ assert_eq "$(cat /etc/timezone)" "$ORIG_TZ"
|
|
|
8d419f |
+ fi
|
|
|
8d419f |
fi
|
|
|
8d419f |
+
|
|
|
8d419f |
+ restore_timezone
|
|
|
8d419f |
+ trap - EXIT
|
|
|
8d419f |
}
|
|
|
8d419f |
|
|
|
8d419f |
restore_adjtime() {
|