From: Glenn Morris <rgm@gnu.org>
Date: Sat, 15 Dec 2018 22:49:46 +0000 (-0800)
Subject: Fix an eshell ls dired test for non-recent files
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~150^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=face2676a9d5a13b40eaeecfb09a16e81364e916;p=emacs.git

Fix an eshell ls dired test for non-recent files

* test/lisp/eshell/em-ls-tests.el (em-ls-test-bug27844):
Work around an eshell issue with non-recent files.  (Bug#33734)
---

diff --git a/test/lisp/eshell/em-ls-tests.el b/test/lisp/eshell/em-ls-tests.el
index 1ce832f1dcc..ab73bc427a5 100644
--- a/test/lisp/eshell/em-ls-tests.el
+++ b/test/lisp/eshell/em-ls-tests.el
@@ -87,7 +87,14 @@
           (dired-toggle-marks)
           (should (cdr (dired-get-marked-files)))
           (kill-buffer buf)
-          (setq buf (dired (expand-file-name "lisp/subr.el" source-directory)))
+          ;; Eshell's default format duplicates the year for non-recent files,
+          ;; eg "2015-05-06  2015", which doesn't make a lot of sense,
+          ;; and causes this portion of the test to fail if subr.el
+          ;; is non-recent (eg if building from a tarfile unpacked
+          ;; with a fixed early timestamp for reproducibility).  Bug#33734.
+          (let ((eshell-ls-date-format "%b %e"))
+            (setq buf (dired (expand-file-name "lisp/subr.el"
+                                               source-directory))))
           (should (looking-at "subr\\.el")))
       (customize-set-variable 'eshell-ls-use-in-dired orig)
       (and (buffer-live-p buf) (kill-buffer)))))