From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 16 Jun 2022 04:05:22 +0000 (-0500)
Subject: icalendar-tests no longer assumes TZ = wall
X-Git-Tag: emacs-29.0.90~1447^2~1729
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=16ee227c18db0d70d9a3e97230119464924797cc;p=emacs.git

icalendar-tests no longer assumes TZ = wall

Do not assume that the TZ environment variable is either unset or
agrees with /etc/localtime.  I ran into this test bug while
running ‘TZ=America/Chicago make check’ on a platform where
/etc/localtime was America/Los_Angeles.
* test/lisp/calendar/icalendar-tests.el:
(icalendar-tests--decode-isodatetime): Don’t use
set-time-zone-rule, whose doc string says “Instead of calling this
function, you typically want something else” for a reason.
Instead, pass the zone arg to icalendar-test--format.
---

diff --git a/test/lisp/calendar/icalendar-tests.el b/test/lisp/calendar/icalendar-tests.el
index c918b0f63fa..ac7a84aa571 100644
--- a/test/lisp/calendar/icalendar-tests.el
+++ b/test/lisp/calendar/icalendar-tests.el
@@ -1639,19 +1639,17 @@ SUMMARY:NNN Wwwwwwww Wwwww - Aaaaaa Pppppppp rrrrrr ddd oo Nnnnnnnn 30
                  "2004-09-17T03:09:10+0000"))
   (let ((orig (icalendar-test--format "20040917T050910")))
     (unwind-protect
-        (progn
-          (set-time-zone-rule "UTC-02:00")
-          (should (equal (icalendar-test--format "20040917T050910")
+	(let ((zone "XXX-02"))
+	  (should (equal (icalendar-test--format "20040917T050910" nil zone)
                          "2004-09-17T03:09:10+0000"))
-          (should (equal (icalendar-test--format "20040917T0509")
+	  (should (equal (icalendar-test--format "20040917T0509" nil zone)
                          "2004-09-17T03:09:00+0000"))
-          (should (equal (icalendar-test--format "20040917")
+	  (should (equal (icalendar-test--format "20040917" nil zone)
                          "2004-09-16T22:00:00+0000"))
-          (should (equal (icalendar-test--format "20040917T050910" 1)
+	  (should (equal (icalendar-test--format "20040917T050910" 1 zone)
                          "2004-09-18T03:09:10+0000"))
-          (should (equal (icalendar-test--format "20040917T050910" 30)
+	  (should (equal (icalendar-test--format "20040917T050910" 30 zone)
                          "2004-10-17T03:09:10+0000")))
-      (set-time-zone-rule 'wall) ;; (set-time-zone-rule nil) is broken
       (should (equal orig (icalendar-test--format "20040917T050910")))))
   (should (equal (icalendar-test--format "20040917T050910Z")
                  "2004-09-17T05:09:10+0000"))