diff options
Diffstat (limited to 'test/src/filelock-tests.el')
| -rw-r--r-- | test/src/filelock-tests.el | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/test/src/filelock-tests.el b/test/src/filelock-tests.el index 1f055cfebc6..f4ae7192796 100644 --- a/test/src/filelock-tests.el +++ b/test/src/filelock-tests.el @@ -26,7 +26,7 @@ ;;; Code: -(require 'cl-macs) +(require 'cl-lib) (require 'ert) (require 'ert-x) (require 'seq) @@ -38,8 +38,12 @@ Create a test directory and a buffer whose `buffer-file-name' and Finally, delete the buffer and the test directory." (declare (debug (body))) `(ert-with-temp-directory temp-dir - (let ((name (concat (file-name-as-directory temp-dir) - "userfile")) + (let ((name + ;; Use file-truename for when 'temporary-file-directory' + ;; is a symlink, to make sure 'buffer-file-name' is set + ;; below to a real existing file. + (file-truename (concat (file-name-as-directory temp-dir) + "userfile"))) (create-lockfiles t)) (with-temp-buffer (setq buffer-file-name name @@ -105,7 +109,7 @@ the case)." (ert-deftest filelock-tests-lock-spoiled () "Check `lock-buffer'." - (skip-unless (not (eq system-type 'ms-dos))) ; no filelock support + (skip-when (eq system-type 'ms-dos)) ; no filelock support (filelock-tests--fixture (filelock-tests--spoil-lock-file buffer-file-truename) ;; FIXME: errors when locking a file are ignored; should they be? @@ -115,7 +119,7 @@ the case)." (ert-deftest filelock-tests-file-locked-p-spoiled () "Check that `file-locked-p' fails if the lockfile is \"spoiled\"." - (skip-unless (not (eq system-type 'ms-dos))) ; no filelock support + (skip-when (eq system-type 'ms-dos)) ; no filelock support (filelock-tests--fixture (filelock-tests--spoil-lock-file buffer-file-truename) (let ((err (should-error (file-locked-p (buffer-file-name))))) @@ -126,7 +130,7 @@ the case)." (ert-deftest filelock-tests-unlock-spoiled () "Check that `unlock-buffer' fails if the lockfile is \"spoiled\"." - (skip-unless (not (eq system-type 'ms-dos))) ; no filelock support + (skip-when (eq system-type 'ms-dos)) ; no filelock support (filelock-tests--fixture ;; Set the buffer modified with file locking temporarily disabled. (let ((create-lockfiles nil)) @@ -146,7 +150,7 @@ the case)." (ert-deftest filelock-tests-kill-buffer-spoiled () "Check that `kill-buffer' fails if a lockfile is \"spoiled\"." - (skip-unless (not (eq system-type 'ms-dos))) ; no filelock support + (skip-when (eq system-type 'ms-dos)) ; no filelock support (filelock-tests--fixture ;; Set the buffer modified with file locking temporarily disabled. (let ((create-lockfiles nil)) @@ -172,7 +176,7 @@ the case)." (ert-deftest filelock-tests-detect-external-change () "Check that an external file modification is reported." - (skip-unless (not (eq system-type 'ms-dos))) ; no filelock support + (skip-when (eq system-type 'ms-dos)) ; no filelock support (skip-unless (executable-find "touch")) (skip-unless (executable-find "echo")) (dolist (cl '(t nil)) @@ -184,7 +188,8 @@ the case)." ;; Just changing the file modification on disk doesn't hurt, ;; because file contents in buffer and on disk look equal. - (shell-command (format "touch %s" (buffer-file-name))) + (shell-command (format "touch %s" + (shell-quote-argument (buffer-file-name)))) (insert "bar") (when cl (filelock-tests--should-be-locked)) @@ -198,7 +203,8 @@ the case)." ;; Changing the file contents on disk hurts when buffer is ;; modified. There shall be a query, which we answer. ;; *Messages* buffer is checked for prompt. - (shell-command (format "echo bar >>%s" (buffer-file-name))) + (shell-command (format "echo bar >>%s" + (shell-quote-argument (buffer-file-name)))) (cl-letf (((symbol-function 'read-char-choice) (lambda (prompt &rest _) (message "%s" prompt) ?y))) (ert-with-message-capture captured-messages |