procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Bug#30057

Browse source 
* test/lisp/filenotify-tests.el (file-notify--test-tmpdir): New defvar.
(file-notify--test-cleanup, file-notify--test-make-temp-name)
(file-notify-test01-add-watch, file-notify-test03-events)
(file-notify-test05-file-validity)
(file-notify-test09-watched-file-in-watched-dir)
(file-notify-test10-sufficient-resources): Use it.  (Bug#30057)
This commit is contained in:
Michael Albinus 2018-01-10 13:39:17 +01:00
parent a9b884c60f
commit 3efb1e7def
1 changed files with 36 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
test/lisp/filenotify-tests.el
View file

@ -63,6 +63,7 @@
(format "/mock::%s" temporary-file-directory))) (format "/mock::%s" temporary-file-directory)))
"Temporary directory for Tramp tests.") "Temporary directory for Tramp tests.")
(defvar file-notify--test-tmpdir nil)
(defvar file-notify--test-tmpfile nil) (defvar file-notify--test-tmpfile nil)
(defvar file-notify--test-tmpfile1 nil) (defvar file-notify--test-tmpfile1 nil)
(defvar file-notify--test-desc nil) (defvar file-notify--test-desc nil)
@ -152,6 +153,8 @@ Return nil when any other file notification watch is still active."
(if (file-directory-p file-notify--test-tmpfile1) (if (file-directory-p file-notify--test-tmpfile1)
(delete-directory file-notify--test-tmpfile1 'recursive) (delete-directory file-notify--test-tmpfile1 'recursive)
(delete-file file-notify--test-tmpfile1))) (delete-file file-notify--test-tmpfile1)))
(ignore-errors
(delete-directory file-notify--test-tmpdir 'recursive))
(ignore-errors (ignore-errors
(when (file-remote-p temporary-file-directory) (when (file-remote-p temporary-file-directory)
(tramp-cleanup-connection (tramp-cleanup-connection
@ -160,7 +163,8 @@ Return nil when any other file notification watch is still active."
(when (hash-table-p file-notify-descriptors) (when (hash-table-p file-notify-descriptors)
(clrhash file-notify-descriptors)) (clrhash file-notify-descriptors))
(setq file-notify--test-tmpfile nil (setq file-notify--test-tmpdir nil
file-notify--test-tmpfile nil
file-notify--test-tmpfile1 nil file-notify--test-tmpfile1 nil
file-notify--test-desc nil file-notify--test-desc nil
file-notify--test-desc1 nil file-notify--test-desc1 nil
@ -274,6 +278,17 @@ This returns only for the local case and gfilenotify; otherwise it is nil.
(file-notify--deftest-remote file-notify-test00-availability (file-notify--deftest-remote file-notify-test00-availability
"Test availability of `file-notify' for remote files.") "Test availability of `file-notify' for remote files.")
(defun file-notify--test-make-temp-name ()
"Create a temporary file name for test."
(unless (stringp file-notify--test-tmpdir)
(setq file-notify--test-tmpdir
(expand-file-name
(make-temp-name "file-notify-test") temporary-file-directory)))
(unless (file-directory-p file-notify--test-tmpdir)
(make-directory file-notify--test-tmpdir))
(expand-file-name
(make-temp-name "file-notify-test") file-notify--test-tmpdir))
(ert-deftest file-notify-test01-add-watch () (ert-deftest file-notify-test01-add-watch ()
"Check `file-notify-add-watch'." "Check `file-notify-add-watch'."
(skip-unless (file-notify--test-local-enabled)) (skip-unless (file-notify--test-local-enabled))
@ -289,17 +304,17 @@ This returns only for the local case and gfilenotify; otherwise it is nil.
(should (should
(setq file-notify--test-desc (setq file-notify--test-desc
(file-notify-add-watch (file-notify-add-watch
temporary-file-directory '(change) #'ignore))) file-notify--test-tmpdir '(change) #'ignore)))
(file-notify-rm-watch file-notify--test-desc) (file-notify-rm-watch file-notify--test-desc)
(should (should
(setq file-notify--test-desc (setq file-notify--test-desc
(file-notify-add-watch (file-notify-add-watch
temporary-file-directory '(attribute-change) #'ignore))) file-notify--test-tmpdir '(attribute-change) #'ignore)))
(file-notify-rm-watch file-notify--test-desc) (file-notify-rm-watch file-notify--test-desc)
(should (should
(setq file-notify--test-desc (setq file-notify--test-desc
(file-notify-add-watch (file-notify-add-watch
temporary-file-directory '(change attribute-change) #'ignore))) file-notify--test-tmpdir '(change attribute-change) #'ignore)))
(file-notify-rm-watch file-notify--test-desc) (file-notify-rm-watch file-notify--test-desc)
;; File monitors like kqueue insist, that the watched file ;; File monitors like kqueue insist, that the watched file
@ -325,11 +340,11 @@ This returns only for the local case and gfilenotify; otherwise it is nil.
'(wrong-type-argument 1))) '(wrong-type-argument 1)))
(should (should
(equal (should-error (equal (should-error
(file-notify-add-watch temporary-file-directory 2 3)) (file-notify-add-watch file-notify--test-tmpdir 2 3))
'(wrong-type-argument 2))) '(wrong-type-argument 2)))
(should (should
(equal (should-error (equal (should-error
(file-notify-add-watch temporary-file-directory '(change) 3)) (file-notify-add-watch file-notify--test-tmpdir '(change) 3))
'(wrong-type-argument 3))) '(wrong-type-argument 3)))
;; The upper directory of a file must exist. ;; The upper directory of a file must exist.
(should (should
@ -349,11 +364,6 @@ This returns only for the local case and gfilenotify; otherwise it is nil.
(file-notify--deftest-remote file-notify-test01-add-watch (file-notify--deftest-remote file-notify-test01-add-watch
"Check `file-notify-add-watch' for remote files.") "Check `file-notify-add-watch' for remote files.")
(defun file-notify--test-make-temp-name ()
"Create a temporary file name for test."
(expand-file-name
(make-temp-name "file-notify-test") temporary-file-directory))
;; This test is inspired by Bug#26126 and Bug#26127. ;; This test is inspired by Bug#26126 and Bug#26127.
(ert-deftest file-notify-test02-rm-watch () (ert-deftest file-notify-test02-rm-watch ()
"Check `file-notify-rm-watch'." "Check `file-notify-rm-watch'."
@ -612,13 +622,13 @@ delivered."
;; Check file creation, change and deletion when watching a ;; Check file creation, change and deletion when watching a
;; directory. There must be a `stopped' event when deleting ;; directory. There must be a `stopped' event when deleting
;; the directory. ;; the directory.
(let ((temporary-file-directory (let ((file-notify--test-tmpdir
(make-temp-file "file-notify-test-parent" t))) (make-temp-file "file-notify-test-parent" t)))
(should (should
(setq file-notify--test-tmpfile (file-notify--test-make-temp-name) (setq file-notify--test-tmpfile (file-notify--test-make-temp-name)
file-notify--test-desc file-notify--test-desc
(file-notify-add-watch (file-notify-add-watch
temporary-file-directory file-notify--test-tmpdir
'(change) #'file-notify--test-event-handler))) '(change) #'file-notify--test-event-handler)))
(file-notify--test-with-events (file-notify--test-with-events
(cond (cond
@ -643,18 +653,18 @@ delivered."
(write-region (write-region
"any text" nil file-notify--test-tmpfile nil 'no-message) "any text" nil file-notify--test-tmpfile nil 'no-message)
(file-notify--test-read-event) (file-notify--test-read-event)
(delete-directory temporary-file-directory 'recursive)) (delete-directory file-notify--test-tmpdir 'recursive))
(file-notify-rm-watch file-notify--test-desc)) (file-notify-rm-watch file-notify--test-desc))
;; Check copy of files inside a directory. ;; Check copy of files inside a directory.
(let ((temporary-file-directory (let ((file-notify--test-tmpdir
(make-temp-file "file-notify-test-parent" t))) (make-temp-file "file-notify-test-parent" t)))
(should (should
(setq file-notify--test-tmpfile (file-notify--test-make-temp-name) (setq file-notify--test-tmpfile (file-notify--test-make-temp-name)
file-notify--test-tmpfile1 (file-notify--test-make-temp-name) file-notify--test-tmpfile1 (file-notify--test-make-temp-name)
file-notify--test-desc file-notify--test-desc
(file-notify-add-watch (file-notify-add-watch
temporary-file-directory file-notify--test-tmpdir
'(change) #'file-notify--test-event-handler))) '(change) #'file-notify--test-event-handler)))
(file-notify--test-with-events (file-notify--test-with-events
(cond (cond
@ -689,18 +699,18 @@ delivered."
(file-notify--test-read-event) (file-notify--test-read-event)
(set-file-times file-notify--test-tmpfile '(0 0)) (set-file-times file-notify--test-tmpfile '(0 0))
(file-notify--test-read-event) (file-notify--test-read-event)
(delete-directory temporary-file-directory 'recursive)) (delete-directory file-notify--test-tmpdir 'recursive))
(file-notify-rm-watch file-notify--test-desc)) (file-notify-rm-watch file-notify--test-desc))
;; Check rename of files inside a directory. ;; Check rename of files inside a directory.
(let ((temporary-file-directory (let ((file-notify--test-tmpdir
(make-temp-file "file-notify-test-parent" t))) (make-temp-file "file-notify-test-parent" t)))
(should (should
(setq file-notify--test-tmpfile (file-notify--test-make-temp-name) (setq file-notify--test-tmpfile (file-notify--test-make-temp-name)
file-notify--test-tmpfile1 (file-notify--test-make-temp-name) file-notify--test-tmpfile1 (file-notify--test-make-temp-name)
file-notify--test-desc file-notify--test-desc
(file-notify-add-watch (file-notify-add-watch
temporary-file-directory file-notify--test-tmpdir
'(change) #'file-notify--test-event-handler))) '(change) #'file-notify--test-event-handler)))
(file-notify--test-with-events (file-notify--test-with-events
(cond (cond
@ -729,7 +739,7 @@ delivered."
(rename-file file-notify--test-tmpfile file-notify--test-tmpfile1) (rename-file file-notify--test-tmpfile file-notify--test-tmpfile1)
;; After the rename, we won't get events anymore. ;; After the rename, we won't get events anymore.
(file-notify--test-read-event) (file-notify--test-read-event)
(delete-directory temporary-file-directory 'recursive)) (delete-directory file-notify--test-tmpdir 'recursive))
(file-notify-rm-watch file-notify--test-desc)) (file-notify-rm-watch file-notify--test-desc))
;; Check attribute change. Does not work for cygwin. ;; Check attribute change. Does not work for cygwin.
@ -930,13 +940,13 @@ delivered."
(file-notify--test-cleanup)) (file-notify--test-cleanup))
(unwind-protect (unwind-protect
(let ((temporary-file-directory (let ((file-notify--test-tmpdir
(make-temp-file "file-notify-test-parent" t))) (make-temp-file "file-notify-test-parent" t)))
(should (should
(setq file-notify--test-tmpfile (file-notify--test-make-temp-name) (setq file-notify--test-tmpfile (file-notify--test-make-temp-name)
file-notify--test-desc file-notify--test-desc
(file-notify-add-watch (file-notify-add-watch
temporary-file-directory file-notify--test-tmpdir
'(change) #'file-notify--test-event-handler))) '(change) #'file-notify--test-event-handler)))
(should (file-notify-valid-p file-notify--test-desc)) (should (file-notify-valid-p file-notify--test-desc))
(file-notify--test-with-events (file-notify--test-with-events
@ -961,7 +971,7 @@ delivered."
(write-region (write-region
"any text" nil file-notify--test-tmpfile nil 'no-message) "any text" nil file-notify--test-tmpfile nil 'no-message)
(file-notify--test-read-event) (file-notify--test-read-event)
(delete-directory temporary-file-directory t)) (delete-directory file-notify--test-tmpdir 'recursive))
;; After deleting the parent directory, the descriptor must ;; After deleting the parent directory, the descriptor must
;; not be valid anymore. ;; not be valid anymore.
(should-not (file-notify-valid-p file-notify--test-desc)) (should-not (file-notify-valid-p file-notify--test-desc))
@ -1207,7 +1217,7 @@ the file watch."
;; A file to be watched. ;; A file to be watched.
(should (should
(setq file-notify--test-tmpfile1 (setq file-notify--test-tmpfile1
(let ((temporary-file-directory file-notify--test-tmpfile)) (let ((file-notify--test-tmpdir file-notify--test-tmpfile))
(file-notify--test-make-temp-name)))) (file-notify--test-make-temp-name))))
(write-region "any text" nil file-notify--test-tmpfile1 nil 'no-message) (write-region "any text" nil file-notify--test-tmpfile1 nil 'no-message)
(unwind-protect (unwind-protect
@ -1268,7 +1278,7 @@ the file watch."
(if (zerop (mod i 2)) (if (zerop (mod i 2))
(write-region (write-region
"any text" nil file-notify--test-tmpfile1 t 'no-message) "any text" nil file-notify--test-tmpfile1 t 'no-message)
(let ((temporary-file-directory file-notify--test-tmpfile)) (let ((file-notify--test-tmpdir file-notify--test-tmpfile))
(write-region (write-region
"any text" nil "any text" nil
(file-notify--test-make-temp-name) nil 'no-message)))))) (file-notify--test-make-temp-name) nil 'no-message))))))
@ -1334,7 +1344,7 @@ the file watch."
(setq file-notify--test-tmpfile (setq file-notify--test-tmpfile
(make-temp-file "file-notify-test-parent" t))) (make-temp-file "file-notify-test-parent" t)))
(unwind-protect (unwind-protect
(let ((temporary-file-directory file-notify--test-tmpfile) (let ((file-notify--test-tmpdir file-notify--test-tmpfile)
descs) descs)
(should-error (should-error
(while t (while t