From c734ba68623279d814e857ddc536421a08c38f34 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mattias=20Engdeg=C3=A5rd?= Date: Tue, 12 Jan 2021 21:38:47 +0100 Subject: [PATCH] Fix Indian time zone test when run by Irishmen (bug#45818) * test/lisp/calendar/solar-tests.el (solar-sunrise-sunset): Inhibit any attempt by confused calendar code to apply daylight saving correction when Irish time zone settings are in effect. It's not entirely clear why this is needed but may be related to the fact that 'IST' stands for both Irish and Indian Standard Time, and that Ireland uses reversed daylight saving in winter. --- test/lisp/calendar/solar-tests.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/lisp/calendar/solar-tests.el b/test/lisp/calendar/solar-tests.el index 7a37f8db558..337deb8ce9a 100644 --- a/test/lisp/calendar/solar-tests.el +++ b/test/lisp/calendar/solar-tests.el @@ -26,7 +26,9 @@ (calendar-longitude 75.8) (calendar-time-zone +330) (calendar-standard-time-zone-name "IST") - (calendar-daylight-time-zone-name "IST") + ;; Make sure our clockwork isn't confused by daylight saving rules + ;; in effect for any other time zone (bug#45818). + (calendar-daylight-savings-starts nil) (epsilon (/ 60.0))) ; Minute accuracy is good enough. (let* ((sunrise-sunset (solar-sunrise-sunset '(12 30 2020))) (sunrise (car (nth 0 sunrise-sunset))) -- 2.39.5