From ac479364ed5913b5f0b3e8f136107e3a50b846a9 Mon Sep 17 00:00:00 2001 From: Philipp Stephani Date: Wed, 26 Mar 2025 03:32:46 +0100 Subject: [PATCH] Use numeric time zone suffix in ERT explainer. This is more robust since the time zone name is system-dependent. * lisp/emacs-lisp/ert.el (ert--explain-time-equal-p): Use numeric time zone suffix. * test/lisp/emacs-lisp/ert-tests.el (ert-test-explain-time-equal-p): Adapt test. (cherry picked from commit 2d278a0f2e945eef30752550f900c1c88367fb6b) --- lisp/emacs-lisp/ert.el | 4 ++-- test/lisp/emacs-lisp/ert-tests.el | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index f2d0a175b55..3548b3baf59 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -669,8 +669,8 @@ A and B are the time values to compare." (side-effect-free t)) (unless (time-equal-p a b) `(different-time-values - ,(format-time-string "%F %T.%N %Z" a t) - ,(format-time-string "%F %T.%N %Z" b t) + ,(format-time-string "%F %T.%N%z" a t) + ,(format-time-string "%F %T.%N%z" b t) difference ,(format-time-string "%s.%N" (time-subtract a b) t)))) (function-put #'time-equal-p 'ert-explainer #'ert--explain-time-equal-p) diff --git a/test/lisp/emacs-lisp/ert-tests.el b/test/lisp/emacs-lisp/ert-tests.el index 32066d42154..3765bf5f0bb 100644 --- a/test/lisp/emacs-lisp/ert-tests.el +++ b/test/lisp/emacs-lisp/ert-tests.el @@ -796,8 +796,8 @@ This macro is used to test if macroexpansion in `should' works." (should-not (ert--explain-time-equal-p 123 '(0 123 0 0))) (should (equal (ert--explain-time-equal-p 123 '(0 120 0 0)) '(different-time-values - "1970-01-01 00:02:03.000000000 UTC" - "1970-01-01 00:02:00.000000000 UTC" + "1970-01-01 00:02:03.000000000+0000" + "1970-01-01 00:02:00.000000000+0000" difference "3.000000000")))) (ert-deftest ert-test-stats-set-test-and-result () -- 2.39.5