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

Fix filenotify-tests.el for cygwin

Browse source 
* test/lisp/filenotify-tests.el (file-notify--test-read-event):
Add an additional `sit-for'.
(file-notify-test02-rm-watch): Add an additional
`file-notify--test-read-event' call.
This commit is contained in:
Michael Albinus 2017-05-01 12:16:15 +02:00
parent 04f915db97
commit ebff4177e2
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/filenotify.el
View file

@ -188,8 +188,8 @@ EVENT is the cadr of the event in `file-notify-handle-event'
((memq action '(attrib link)) 'attribute-changed)
((memq action '(create added)) 'created)
((memq action '(modify modified write)) 'changed)
((memq action
'(delete delete-self move-self removed)) 'deleted)
((memq action '(delete delete-self move-self removed))
'deleted)
;; Make the event pending.
((memq action '(moved-from renamed-from))
(setq file-notify--pending-event

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

@ -69,6 +69,7 @@
(defun file-notify--test-read-event ()
"Read one event.
There are different timeouts for local and remote file notification libraries."
(sit-for 0.001 'nodisp)
(read-event
nil nil
(cond
@ -426,6 +427,7 @@ This returns only for the local case and gfilenotify; otherwise it is nil.
;; Remove first watch.
(file-notify-rm-watch file-notify--test-desc)
;; Only the second callback shall run.
(file-notify--test-read-event)
(delete-file file-notify--test-tmpfile)
(file-notify--wait-for-events
(file-notify--test-timeout) results)
@ -953,7 +955,7 @@ delivered."
;; After deleting the parent directory, the descriptor must
;; not be valid anymore.
(should-not (file-notify-valid-p file-notify--test-desc))
;; w32notify doesn't generate 'stopped' events when the parent
;; w32notify doesn't generate `stopped' events when the parent
;; directory is deleted, which doesn't provide a chance for
;; filenotify.el to remove the descriptor from the internal
;; hash table it maintains. So we must remove the descriptor