From: Matt Armstrong <gmatta@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 46397@debbugs.gnu.org, eggert@cs.ucla.edu, craven@gmx.net
Subject: bug#46397: [PATCH] Re: bug#46397: 27.1; Cannot delete buffer pointing to a file in a path that includes a file
Date: Mon, 22 Feb 2021 11:24:56 -0800 [thread overview]
Message-ID: <m2o8gb7vnb.fsf@matts-mbp-2016.lan> (raw)
In-Reply-To: <m2ft1w25xa.fsf@matts-mbp-2016.lan>
[-- Attachment #1: Type: text/plain, Size: 136 bytes --]
Tags: patch
Attached is a rev of my prior patch to add some test coverage for
src/filelock.c.
P.S. my FSF copyright papers are done.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Add-some-test-coverage-for-src-filelock.c-Bug-46397.patch --]
[-- Type: text/x-patch, Size: 6780 bytes --]
From 18529d097624e0d4647cf04118d4ce98adc474ba Mon Sep 17 00:00:00 2001
From: Matt Armstrong <matt@rfc20.org>
Date: Mon, 15 Feb 2021 12:59:08 -0800
Subject: [PATCH] Add some test coverage for src/filelock.c (Bug#46397).
* test/src/filelock-tests.el: New file.
---
test/src/filelock-tests.el | 148 +++++++++++++++++++++++++++++++++++++
1 file changed, 148 insertions(+)
create mode 100644 test/src/filelock-tests.el
diff --git a/test/src/filelock-tests.el b/test/src/filelock-tests.el
new file mode 100644
index 0000000000..d9534e2d16
--- /dev/null
+++ b/test/src/filelock-tests.el
@@ -0,0 +1,148 @@
+;;; filelock-tests.el --- test file locking -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2021 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This file tests code in src/filelock.c and related buffer and file
+;; I/O code.
+
+;;; Code:
+
+(require 'ert)
+
+(defun filelock-tests--supported-p ()
+ "Return t if the current system implements file locking."
+ (not (memq system-type '(ms-dos))))
+
+(defun filelock-tests--call-with-fixture (body)
+ "Call BODY under a standard test fixture.
+See `filelock-tests--with-fixture'."
+ (let* ((test-dir (make-temp-file "filelock-tests-" t))
+ (test-dir-modes (file-modes test-dir)))
+ (unwind-protect
+ (let ((file-name (file-truename
+ (concat (file-name-as-directory test-dir)
+ "file"))))
+ (with-temp-buffer
+ (let ((temp-buffer (current-buffer)))
+ ;; Setting both file names is sufficient to enable file
+ ;; locks.
+ (setq buffer-file-name file-name
+ buffer-file-truename file-name)
+ (unwind-protect
+ (let ((create-lockfiles t))
+ (funcall body))
+ (set-file-modes test-dir test-dir-modes)
+ (when (buffer-live-p temp-buffer)
+ (with-current-buffer temp-buffer
+ (set-buffer-modified-p nil)))))))
+ (delete-directory test-dir t nil))))
+
+(defmacro filelock-tests--with-fixture (&rest body)
+ "Create a test fixture evaluate BODY there like `progn'.
+Create a temporary directory, then create a temporary buffer and
+set it the variable `buffer-file-name' and `buffer-file-truename'
+to it, let bind `create-lockfiles' to 't' and evaluate BODY.
+Finally, delete the temporary directory."
+ (declare (indent 0))
+ `(filelock-tests--call-with-fixture
+ (lambda () ,@body)))
+
+(ert-deftest filelock-tests-when-create-lockfiles-nil ()
+ (filelock-tests--with-fixture
+ (let ((create-lockfiles nil))
+ (should (not (file-locked-p buffer-file-truename)))
+ (insert "some text")
+ (lock-buffer)
+ (should (not (file-locked-p buffer-file-truename))))))
+
+(ert-deftest filelock-tests-when-create-lockfiles-t ()
+ (filelock-tests--with-fixture
+ (should (equal t create-lockfiles))
+ (insert "some text")
+ (lock-buffer)
+ ;; Verify 't' explicitly and not any true value; 't' alone means
+ ;; the current process owns the lock.
+ (let ((expected (if (filelock-tests--supported-p)
+ t
+ nil)))
+ (should (equal expected (file-locked-p buffer-file-truename)))
+ (unlock-buffer)
+ (should (equal nil (file-locked-p buffer-file-truename))))))
+
+(ert-deftest filelock-tests-file-locked-p-inaccessible-dir ()
+ (skip-unless (filelock-tests--supported-p))
+ (filelock-tests--with-fixture
+ (set-file-modes (file-name-directory (buffer-file-name))
+ (file-modes-symbolic-to-number "ugo="))
+ (set-buffer-modified-p t)
+ (let ((full-error (should-error (file-locked-p (buffer-file-name))
+ :type 'file-error)))
+ (should (equal "Testing file lock" (nth 1 full-error))))))
+
+(ert-deftest filelock-tests-lock-buffer-inaccessible-dir ()
+ (skip-unless (filelock-tests--supported-p))
+ (filelock-tests--with-fixture
+ (let* ((test-dir (file-name-directory (buffer-file-name)))
+ (original-modes (file-modes test-dir)))
+ (set-file-modes test-dir (file-modes-symbolic-to-number "ugo="))
+ (insert "some text")
+ ;; FIXME: (lock-buffer) should signal an error here.
+ (lock-buffer)
+ (set-file-modes test-dir original-modes)
+ (should (equal nil (file-locked-p (buffer-file-name)))))))
+
+(ert-deftest filelock-tests-lock-buffer-dir-not-writeable ()
+ (skip-unless (filelock-tests--supported-p))
+ (filelock-tests--with-fixture
+ (set-file-modes (file-name-directory (buffer-file-name))
+ (file-modes-symbolic-to-number "u=rx"))
+ (insert "some text")
+ ;; FIXME: (lock-buffer) should signal here, but lock_file() in
+ ;; filelock.c ignores some file system errors; see the related
+ ;; FIXME there.
+ (lock-buffer)
+ (should (equal nil (file-locked-p (buffer-file-name))))))
+
+(ert-deftest filelock-tests-unlock-buffer-inaccessible-dir ()
+ (skip-unless (filelock-tests--supported-p))
+ (filelock-tests--with-fixture
+ (insert "some text")
+ (lock-buffer)
+ (should (file-locked-p (buffer-file-name)))
+ (set-file-modes (file-name-directory (buffer-file-name))
+ (file-modes-symbolic-to-number "ugo="))
+ (let ((full-error (should-error (unlock-buffer)
+ :type 'file-error)))
+ (should (equal "Unlocking file" (nth 1 full-error))))))
+
+(ert-deftest filelock-tests-unlock-buffer-dir-not-writeable ()
+ (skip-unless (filelock-tests--supported-p))
+ (filelock-tests--with-fixture
+ (insert "some text")
+ (should (file-locked-p (buffer-file-name)))
+ (set-file-modes (file-name-directory (buffer-file-name))
+ (file-modes-symbolic-to-number "u=rx"))
+ (let ((full-error (should-error (unlock-buffer)
+ :type 'file-error)))
+ (should (equal "Unlocking file" (nth 1 full-error))))))
+
+(provide 'filelock-tests)
+
+;;; filelock-tests.el ends here
--
2.30.0
next prev parent reply other threads:[~2021-02-22 19:24 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-09 9:47 bug#46397: 27.1; Cannot delete buffer pointing to a file in a path that includes a file Peter
2021-02-09 23:47 ` Matt Armstrong
2021-02-10 0:23 ` Matt Armstrong
2021-02-10 15:05 ` Eli Zaretskii
2021-02-10 19:23 ` Paul Eggert
2021-02-10 19:45 ` Eli Zaretskii
2021-02-10 22:39 ` Matt Armstrong
2021-02-12 7:43 ` Eli Zaretskii
2021-02-12 9:36 ` Paul Eggert
2021-02-12 11:33 ` Eli Zaretskii
2021-02-12 23:59 ` Matt Armstrong
2021-02-13 8:07 ` Eli Zaretskii
2021-02-11 22:14 ` Matt Armstrong
2021-02-12 2:20 ` Paul Eggert
2021-02-12 7:15 ` Eli Zaretskii
2021-02-13 1:15 ` Matt Armstrong
2021-02-13 1:26 ` Paul Eggert
2021-02-13 8:21 ` Eli Zaretskii
2021-02-13 8:28 ` Eli Zaretskii
2021-02-14 0:49 ` Matt Armstrong
2021-02-14 19:22 ` Eli Zaretskii
2021-02-14 22:16 ` Matt Armstrong
2021-02-15 15:09 ` Eli Zaretskii
2021-02-16 0:49 ` Matt Armstrong
2021-02-16 1:55 ` Paul Eggert
2021-02-16 15:06 ` Eli Zaretskii
2021-02-16 11:53 ` Lars Ingebrigtsen
2021-02-22 19:24 ` Matt Armstrong [this message]
2021-02-19 19:10 ` Matt Armstrong
2021-02-19 19:23 ` Eli Zaretskii
2021-02-19 21:46 ` Matt Armstrong
2021-02-20 9:09 ` Eli Zaretskii
2021-02-21 0:36 ` Matt Armstrong
2021-02-21 23:43 ` Mike Kupfer
2021-02-22 1:42 ` Matt Armstrong
2021-03-14 18:03 ` Bill Wohler
2021-03-17 23:36 ` Matt Armstrong
2021-02-24 17:37 ` Matt Armstrong
2021-02-24 18:50 ` Eli Zaretskii
2021-03-01 16:59 ` Eli Zaretskii
2021-03-05 22:19 ` Matt Armstrong
2021-03-06 9:36 ` Eli Zaretskii
2021-03-06 23:39 ` Matt Armstrong
2021-03-07 2:50 ` Paul Eggert
2021-03-07 5:57 ` Matt Armstrong
2021-02-19 19:45 ` Paul Eggert
2021-02-19 21:52 ` Matt Armstrong
2021-03-08 2:18 ` Matt Armstrong
2021-03-11 14:34 ` Eli Zaretskii
2021-03-17 23:49 ` Matt Armstrong
2021-03-17 23:51 ` Matt Armstrong
2021-03-20 10:43 ` Eli Zaretskii
2021-03-22 1:43 ` Matt Armstrong
2021-03-27 9:20 ` Eli Zaretskii
2021-02-10 0:26 ` Matt Armstrong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2o8gb7vnb.fsf@matts-mbp-2016.lan \
--to=gmatta@gmail.com \
--cc=46397@debbugs.gnu.org \
--cc=craven@gmx.net \
--cc=eggert@cs.ucla.edu \
--cc=eliz@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).