From 4169720313cc9786f5b68c2ffdc94ae94e6293ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Engdeg=C3=A5rd?= Date: Thu, 5 Feb 2026 16:26:42 +0100 Subject: [PATCH] ; * test/lisp/vc/ediff-mult-tests.el: use ert-with-temp-directory Suggested by Pip Cet. --- test/lisp/vc/ediff-mult-tests.el | 44 +++++++++++++++----------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/test/lisp/vc/ediff-mult-tests.el b/test/lisp/vc/ediff-mult-tests.el index 4d7f3f35859..7887ae086fe 100644 --- a/test/lisp/vc/ediff-mult-tests.el +++ b/test/lisp/vc/ediff-mult-tests.el @@ -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")))))