summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2021-12-19 17:44:32 +0200
committerEli Zaretskii <eliz@gnu.org>2021-12-19 17:44:32 +0200
commitc139d289df4c76807501c3e35b0d8f4bc8d511ce (patch)
tree630acb2f9b173508a3cd1919a1d336ca37e7da0c
parentcc63704815ee4ae686a0cf86e12f7f2596dd22a3 (diff)
downloademacs-c139d289df4c76807501c3e35b0d8f4bc8d511ce.tar.gz
; Fix last change to filelock-tests.el
* test/src/filelock-tests.el (filelock-tests-file-locked-p-spoiled) (filelock-tests-unlock-spoiled) (filelock-tests-kill-buffer-spoiled): Expect 'permission-denied' only on MS-Windows.
-rw-r--r--test/src/filelock-tests.el18
1 files changed, 13 insertions, 5 deletions
diff --git a/test/src/filelock-tests.el b/test/src/filelock-tests.el
index 2d682e2e789..24dd37e5a4d 100644
--- a/test/src/filelock-tests.el
+++ b/test/src/filelock-tests.el
@@ -123,7 +123,9 @@ the case)."
(filelock-tests--spoil-lock-file buffer-file-truename)
(let ((err (should-error (file-locked-p (buffer-file-name)))))
(should (equal (seq-subseq err 0 2)
- '(permission-denied "Testing file lock")))))))
+ (if (eq system-type 'windows-nt)
+ '(permission-denied "Testing file lock")
+ '(file-error "Testing file lock"))))))))
(ert-deftest filelock-tests-unlock-spoiled ()
"Check that `unlock-buffer' fails if the lockfile is \"spoiled\"."
@@ -144,8 +146,11 @@ the case)."
(lambda (err) (push err errors))))
(unlock-buffer))
(should (consp errors))
- (should (equal '(permission-denied "Unlocking file")
- (seq-subseq (car errors) 0 2)))
+ (should (equal
+ (if (eq system-type 'windows-nt)
+ '(permission-denied "Unlocking file")
+ '(file-error "Unlocking file"))
+ (seq-subseq (car errors) 0 2)))
(should (equal (length errors) 1))))))
(ert-deftest filelock-tests-kill-buffer-spoiled ()
@@ -174,8 +179,11 @@ the case)."
(lambda (err) (push err errors))))
(kill-buffer))
(should (consp errors))
- (should (equal '(permission-denied "Unlocking file")
- (seq-subseq (car errors) 0 2)))
+ (should (equal
+ (if (eq system-type 'windows-nt)
+ '(permission-denied "Unlocking file")
+ '(file-error "Unlocking file"))
+ (seq-subseq (car errors) 0 2)))
(should (equal (length errors) 1))))))
(provide 'filelock-tests)