>From 3937b5b52af3eb78101dc385ac8dfe7a36e2e624 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 15 Sep 2018 14:10:49 -0700 Subject: [PATCH 1/2] Fix icalendar tests to match new behavior * test/lisp/calendar/icalendar-tests.el (icalendar--create-uid): Do not intrude into or rely upon undocumented internal implementation details of icalendar--create-uid. Problem reported by Glenn Morris in: https://lists.gnu.org/r/emacs-devel/2018-09/msg00660.html --- test/lisp/calendar/icalendar-tests.el | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/lisp/calendar/icalendar-tests.el b/test/lisp/calendar/icalendar-tests.el index 2fecabcd75..617e886989 100644 --- a/test/lisp/calendar/icalendar-tests.el +++ b/test/lisp/calendar/icalendar-tests.el @@ -57,17 +57,16 @@ icalendar-tests--trim (ert-deftest icalendar--create-uid () "Test for `icalendar--create-uid'." - (let* ((icalendar-uid-format "xxx-%t-%c-%h-%u-%s") + (let* ((icalendar-uid-format "xxx-%c-%h-%u-%s") (icalendar--uid-count 77) (entry-full "30.06.1964 07:01 blahblah") (hash (format "%d" (abs (sxhash entry-full)))) (contents "DTSTART:19640630T070100\nblahblah") (username (or user-login-name "UNKNOWN_USER"))) - (cl-letf (((symbol-function 'current-time) (lambda () '(1 2 3)))) - (should (= 77 icalendar--uid-count)) - (should (string= (concat "xxx-123-77-" hash "-" username "-19640630") - (icalendar--create-uid entry-full contents))) - (should (= 78 icalendar--uid-count))) + (should (= 77 icalendar--uid-count)) + (should (string= (concat "xxx-77-" hash "-" username "-19640630") + (icalendar--create-uid entry-full contents))) + (should (= 78 icalendar--uid-count)) (setq contents "blahblah") (setq icalendar-uid-format "yyy%syyy") (should (string= (concat "yyyDTSTARTyyy") -- 2.17.1