mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-26 01:40:53 -08:00
Code Issues Projects Releases Wiki Activity

; * test/lisp/vc/ediff-mult-tests.el: use ert-with-temp-directory

Browse source 
Suggested by Pip Cet.
This commit is contained in:
Mattias Engdegård 2026-02-05 16:26:42 +01:00
parent 893e0783c9
commit 4169720313
1 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

44
test/lisp/vc/ediff-mult-tests.el
View file

@ -20,38 +20,34 @@
;;; Code:
(require 'ert)
(require 'ert-x)
(require 'ediff-mult)
(ert-deftest ediff-test-bug3348 ()
"After saving `ediff-meta-diff-buffer' to a file, we should not reuse it."
(let ((test-dir
(expand-file-name "bug-3348-testdir" temporary-file-directory)))
(make-directory test-dir t)
(unwind-protect
(progn
(cd test-dir)
(ert-with-temp-directory test-dir
(cd test-dir)
(make-directory "dir-a" t)
(make-directory "dir-b" t)
(make-directory "dir-a" t)
(make-directory "dir-b" t)
(with-temp-file "dir-a/file"
(insert "aaa\n"))
(with-temp-file "dir-b/file"
(insert "bbb\n"))
(with-temp-file "dir-a/file"
(insert "aaa\n"))
(with-temp-file "dir-b/file"
(insert "bbb\n"))
(ediff-directories "dir-a" "dir-b" nil)
(switch-to-buffer "*Ediff Session Group Panel*")
(ediff-directories "dir-a" "dir-b" nil)
(switch-to-buffer "*Ediff Session Group Panel*")
(ediff-next-meta-item 1)
(ediff-mark-for-operation-at-pos nil)
(ediff-collect-custom-diffs)
(ediff-next-meta-item 1)
(ediff-mark-for-operation-at-pos nil)
(ediff-collect-custom-diffs)
(with-current-buffer "*Ediff Multifile Diffs*"
(write-file "foo.patch"))
(with-current-buffer "*Ediff Multifile Diffs*"
(write-file "foo.patch"))
(with-temp-file "dir-b/file"
(insert "BBB\n"))
(ediff-collect-custom-diffs)
(with-temp-file "dir-b/file"
(insert "BBB\n"))
(ediff-collect-custom-diffs)
(should-not (equal ediff-meta-diff-buffer (get-buffer "foo.patch"))))
(delete-directory test-dir t))))
(should-not (equal ediff-meta-diff-buffer (get-buffer "foo.patch")))))