Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 10:27:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

* test/lisp/filenotify-tests.el (file-notify-test03-events): Adapt test.

Browse source
This commit is contained in:
Michael Albinus 2019-01-05 10:46:49 +01:00
parent 7b1fbcd6ba
commit e906266874
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/filenotify.el
View file

@ -114,7 +114,7 @@ Could be different from the directory watched by the backend library."
(when-let* ((watch (gethash (car event) file-notify-descriptors)))
(directory-file-name
(expand-file-name
(or (and (stringp (nth 2 event)) (nth 2 event)) "")
(or (and (stringp (nth 2 event)) (nth 2 event)) "")
(file-notify--watch-directory watch)))))
;; Only `gfilenotify' could return two file names.
@ -421,9 +421,8 @@ DESCRIPTOR should be an object returned by `file-notify-add-watch'."
;; TODO:
;; * Watching a /dir/file may receive events for dir.
;; (This may be the desired behavior.)
;; * Watching a file in an already watched directory
;; * Watching a file in an already watched directory.
;; If the file is created and *then* a watch is added to that file, the
;; watch might receive events which occurred prior to it being created,
;; due to the way events are propagated during idle time. Note: This

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

@ -673,8 +673,10 @@ delivered."
(file-notify--test-with-events
(cond
;; w32notify does not raise `deleted' and `stopped'
;; events for the watched directory.
((string-equal (file-notify--test-library) "w32notify")
;; events for the watched directory. Same for inotify on emba.
((or (string-equal (file-notify--test-library) "w32notify")
(and (string-equal (file-notify--test-library) "inotify")
(getenv "EMACS_EMBA_CI")))
'(created changed deleted))
;; gvfs-monitor-dir on cygwin does not detect the
;; `created' event reliably.