Re: [Emacs-diffs] master 0e56883: Move undocumented time-stamp formats closer to format-time-string

[Stefan Kangas <stefan@marxist.se>]

[-- Attachment #1: Type: text/plain, Size: 221 bytes --]

> 1 unexpected results:
>    FAILED  time-stamp-test-time-zone

The attached patch seems to fix it, but I don't know enough about this
stuff to know if it's the right one.  What do you think?

Best regards,
Stefan Kangas

[-- Attachment #2: 0001-Fix-one-time-stamp.el-test-on-macOS.patch --]
[-- Type: application/octet-stream, Size: 1341 bytes --]

From 7cfd3045814753c23d0fff512523ba5de43b18f9 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Wed, 9 Oct 2019 14:59:53 +0200
Subject: [PATCH] Fix one time-stamp.el test on macOS

* test/lisp/time-stamp-tests.el (time-stamp-test-time-zone): Fix test
on macOS.
---
 test/lisp/time-stamp-tests.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/lisp/time-stamp-tests.el b/test/lisp/time-stamp-tests.el
index d710564c36..d1ebaf8cfb 100644
--- a/test/lisp/time-stamp-tests.el
+++ b/test/lisp/time-stamp-tests.el
@@ -283,11 +283,11 @@ time-stamp-test-time-zone
   "Test time-stamp formats for time zone."
   (with-time-stamp-test-env
     ;; implemented and documented since 1995
-    (should (equal (time-stamp-string "%Z" ref-time) "GMT"))
+    (should (member (time-stamp-string "%Z" ref-time) '("GMT" "UTC")))
     ;; documented 1995-2019
-    (should (equal (time-stamp-string "%z" ref-time) "gmt"))
+    (should (member (time-stamp-string "%z" ref-time) '("gmt" "utc")))
     ;; implemented since 1997, documented since 2019
-    (should (equal (time-stamp-string "%#Z" ref-time) "gmt"))))
+    (should (member (time-stamp-string "%#Z" ref-time) '("gmt" "utc")))))
 
 (ert-deftest time-stamp-test-non-date-conversions ()
   "Test time-stamp formats for non-date items."
-- 
2.23.0