Merge from savannah/emacs-30

a7b68c25640 Fix intermittent failure of dired-test-bug27243-02
fc25b4d8370 * etc/TODO: Refer to Bug#72127 for Magit assignments.
17c62c1242f Rename treesitter test

2 files changed, 4 insertions, 2 deletions

diff --git a/test/lisp/align-tests.el b/test/lisp/align-tests.el
index eaebaf8360c..486658a9523 100644
--- a/test/lisp/align-tests.el
+++ b/test/lisp/align-tests.el
@@ -51,7 +51,7 @@
 
 (autoload 'treesit-ready-p "treesit")
 
-(ert-deftest align-lua ()
+(ert-deftest align-ts-lua ()
   (skip-unless (treesit-ready-p 'lua t))
   (let ((comment-column 20)
         (indent-tabs-mode nil))
diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el
index 651b77500a1..3b1f80d3d3d 100644
--- a/test/lisp/dired-tests.el
+++ b/test/lisp/dired-tests.el
@@ -189,7 +189,9 @@
 (ert-deftest dired-test-bug27243-02 ()
   "Test for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27243#28 ."
   (ert-with-temp-directory test-dir
-    (let ((dired-auto-revert-buffer t) buffers)
+    (let ((dired-auto-revert-buffer t)
+          (dired-free-space nil)
+          buffers)
       ;; On MS-Windows, get rid of 8+3 short names in test-dir, if the
       ;; corresponding long file names exist, otherwise such names trip
       ;; string comparisons below.