From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 7 Jul 2022 16:34:30 +0000 (+0300)
Subject: Fix buffer-tests
X-Git-Tag: emacs-29.0.90~1447^2~1110
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d397b0421567e4e52bccfa15dc23f4a9b8e6e9f0;p=emacs.git

Fix buffer-tests

* test/src/buffer-tests.el (test-restore-buffer-modified-p): Don't
assume turning on auto-save-mode cannot auto-save immediately.
---

diff --git a/test/src/buffer-tests.el b/test/src/buffer-tests.el
index 13d48b31a4f..cba10a05025 100644
--- a/test/src/buffer-tests.el
+++ b/test/src/buffer-tests.el
@@ -1503,9 +1503,12 @@ with parameters from the *Messages* buffer modification."
 
 (ert-deftest test-restore-buffer-modified-p ()
   (ert-with-temp-file file
+    ;; This avoids the annoying "foo and bar are the same file" on
+    ;; MS-Windows.
+    (setq file (file-truename file))
     (with-current-buffer (find-file file)
       (auto-save-mode 1)
-      (should-not (buffer-modified-p))
+      (should-not (eq (buffer-modified-p) t))
       (insert "foo")
       (should (buffer-modified-p))
       (restore-buffer-modified-p nil)
@@ -1522,9 +1525,10 @@ with parameters from the *Messages* buffer modification."
         (delete-file buffer-auto-save-file-name))))
 
   (ert-with-temp-file file
+    (setq file (file-truename file))
     (with-current-buffer (find-file file)
       (auto-save-mode 1)
-      (should-not (buffer-modified-p))
+      (should-not (eq (buffer-modified-p) t))
       (insert "foo")
       (should (buffer-modified-p))
       (should-not (eq (buffer-modified-p) 'autosaved))