procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix files-tests on MS-Windows

Browse source 
* lisp/ls-lisp.el (ls-lisp--insert-directory): Fix free disk space
calculation.  (Bug#50630)

* test/lisp/files-tests.el (files-tests-revert-buffer)
(files-tests-revert-buffer-with-fine-grain): Disable locking
files.
This commit is contained in:
Eli Zaretskii 2021-11-11 10:58:10 +02:00
parent f96380eb80
commit 3020791e77
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ls-lisp.el
View file

@ -343,7 +343,7 @@ are also supported; unsupported long options are silently ignored."
(goto-char (point-min))
;; First find the line to put it on.
(when (re-search-forward "^total" nil t)
(let ((available (get-free-disk-space ".")))
(let ((available (get-free-disk-space orig-file)))
(when available
;; Replace "total" with "total used", to avoid confusion.
(replace-match "total used in directory")

22
test/lisp/files-tests.el
View file

@ -1531,10 +1531,13 @@ The door of all subtleties!
(ert-with-temp-file temp-file-name
(with-temp-buffer
(insert files-tests-lao)
(write-file temp-file-name)
(erase-buffer)
(insert files-tests-tzu)
(revert-buffer t t t)
;; Disable lock files, since that barfs in
;; userlock--check-content-unchanged on MS-Windows.
(let (create-lockfiles)
(write-file temp-file-name)
(erase-buffer)
(insert files-tests-tzu)
(revert-buffer t t t))
(should (compare-strings files-tests-lao nil nil
(buffer-substring (point-min) (point-max))
nil nil)))))
@ -1544,10 +1547,13 @@ The door of all subtleties!
(ert-with-temp-file temp-file-name
(with-temp-buffer
(insert files-tests-lao)
(write-file temp-file-name)
(erase-buffer)
(insert files-tests-tzu)
(should (revert-buffer-with-fine-grain t t))
;; Disable lock files, since that barfs in
;; userlock--check-content-unchanged on MS-Windows.
(let (create-lockfiles)
(write-file temp-file-name)
(erase-buffer)
(insert files-tests-tzu)
(should (revert-buffer-with-fine-grain t t)))
(should (compare-strings files-tests-lao nil nil
(buffer-substring (point-min) (point-max))
nil nil)))))