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

Further adaptions in file-notify-tests.el for w32notify

Browse source 
* test/automated/file-notify-tests.el
(file-notify--test-read-event-timeout, file-notify--test-timeout):
Decrease values.
(file-notify-test03-autorevert)
(file-notify-test04-file-validity)
(file-notify-test05-dir-validity): Run tests also for w32notify.
(file-notify-test08-watched-file-in-watched-dir):
Adapt expected events for w32notify.
This commit is contained in:
Michael Albinus 2016-02-23 13:51:36 +01:00
parent a1585e18c0
commit c582def527
1 changed files with 76 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
test/automated/file-notify-tests.el
View file

@ -64,7 +64,7 @@
(defvar file-notify--test-event nil) (defvar file-notify--test-event nil)
(defvar file-notify--test-events nil) (defvar file-notify--test-events nil)
(defconst file-notify--test-read-event-timeout 0.02 (defconst file-notify--test-read-event-timeout 0.01
"Timeout for `read-event' calls. "Timeout for `read-event' calls.
It is different for local and remote file notification libraries.") It is different for local and remote file notification libraries.")
@ -72,7 +72,7 @@ It is different for local and remote file notification libraries.")
"Timeout to wait for arriving events, in seconds." "Timeout to wait for arriving events, in seconds."
(cond (cond
((file-remote-p temporary-file-directory) 6) ((file-remote-p temporary-file-directory) 6)
((string-equal (file-notify--test-library) "w32notify") 10) ((string-equal (file-notify--test-library) "w32notify") 4)
((eq system-type 'cygwin) 10) ((eq system-type 'cygwin) 10)
(t 3))) (t 3)))
@ -417,8 +417,8 @@ longer than timeout seconds for the events to be delivered."
'(change) 'file-notify--test-event-handler))) '(change) 'file-notify--test-event-handler)))
(file-notify--test-with-events (file-notify--test-with-events
(cond (cond
;; w32notify does raise a `stopped' event when a ;; w32notify does not raise `deleted' and `stopped'
;; watched directory is deleted. ;; events for the watched directory.
((string-equal (file-notify--test-library) "w32notify") ((string-equal (file-notify--test-library) "w32notify")
'(created changed deleted)) '(created changed deleted))
;; cygwin recognizes only `deleted' and `stopped' events. ;; cygwin recognizes only `deleted' and `stopped' events.
@ -449,9 +449,11 @@ longer than timeout seconds for the events to be delivered."
(file-notify--test-with-events (file-notify--test-with-events
(cond (cond
;; w32notify does not distinguish between `changed' and ;; w32notify does not distinguish between `changed' and
;; `attribute-changed'. ;; `attribute-changed'. It does not raise `deleted'
;; and `stopped' events for the watched directory.
((string-equal (file-notify--test-library) "w32notify") ((string-equal (file-notify--test-library) "w32notify")
'(created changed created changed changed changed changed '(created changed created changed
changed changed changed
deleted deleted)) deleted deleted))
;; cygwin recognizes only `deleted' and `stopped' events. ;; cygwin recognizes only `deleted' and `stopped' events.
((eq system-type 'cygwin) ((eq system-type 'cygwin)
@ -488,8 +490,8 @@ longer than timeout seconds for the events to be delivered."
'(change) 'file-notify--test-event-handler))) '(change) 'file-notify--test-event-handler)))
(file-notify--test-with-events (file-notify--test-with-events
(cond (cond
;; w32notify does not distinguish between `changed' and ;; w32notify does not raise `deleted' and `stopped'
;; `attribute-changed'. ;; events for the watched directory.
((string-equal (file-notify--test-library) "w32notify") ((string-equal (file-notify--test-library) "w32notify")
'(created changed renamed deleted)) '(created changed renamed deleted))
;; cygwin recognizes only `deleted' and `stopped' events. ;; cygwin recognizes only `deleted' and `stopped' events.
@ -604,8 +606,6 @@ longer than timeout seconds for the events to be delivered."
(should (string-match "another text" (buffer-string))) (should (string-match "another text" (buffer-string)))
;; Stop file notification. Autorevert shall still work via polling. ;; Stop file notification. Autorevert shall still work via polling.
;; It doesn't work for w32notify.
(unless (string-equal (file-notify--test-library) "w32notify")
(file-notify-rm-watch auto-revert-notify-watch-descriptor) (file-notify-rm-watch auto-revert-notify-watch-descriptor)
(file-notify--wait-for-events (file-notify--wait-for-events
timeout (null auto-revert-use-notify)) timeout (null auto-revert-use-notify))
@ -628,7 +628,7 @@ longer than timeout seconds for the events to be delivered."
(string-match (string-match
(format-message "Reverting buffer `%s'." (buffer-name buf)) (format-message "Reverting buffer `%s'." (buffer-name buf))
(buffer-string)))) (buffer-string))))
(should (string-match "foo bla" (buffer-string)))))) (should (string-match "foo bla" (buffer-string)))))
;; Cleanup. ;; Cleanup.
(with-current-buffer "*Messages*" (widen)) (with-current-buffer "*Messages*" (widen))
@ -699,9 +699,6 @@ longer than timeout seconds for the events to be delivered."
(file-notify--test-cleanup)) (file-notify--test-cleanup))
(unwind-protect (unwind-protect
;; w32notify does not send a `stopped' event when deleting a
;; directory. The test does not work, therefore.
(unless (string-equal (file-notify--test-library) "w32notify")
(let ((temporary-file-directory (let ((temporary-file-directory
(make-temp-file "file-notify-test-parent" t))) (make-temp-file "file-notify-test-parent" t)))
(should (should
@ -712,11 +709,15 @@ longer than timeout seconds for the events to be delivered."
'(change) #'file-notify--test-event-handler))) '(change) #'file-notify--test-event-handler)))
(file-notify--test-with-events (file-notify--test-with-events
(cond (cond
;; w32notify does not raise `deleted' and `stopped' events
;; for the watched directory.
((string-equal (file-notify--test-library) "w32notify")
'(created changed deleted))
;; cygwin recognizes only `deleted' and `stopped' events. ;; cygwin recognizes only `deleted' and `stopped' events.
((eq system-type 'cygwin) ((eq system-type 'cygwin)
'(deleted stopped)) '(deleted stopped))
;; There are two `deleted' events, for the file and for ;; There are two `deleted' events, for the file and for the
;; the directory. Except for kqueue. ;; directory. Except for kqueue.
((string-equal (file-notify--test-library) "kqueue") ((string-equal (file-notify--test-library) "kqueue")
'(created changed deleted stopped)) '(created changed deleted stopped))
(t '(created changed deleted deleted stopped))) (t '(created changed deleted deleted stopped)))
@ -728,7 +729,7 @@ longer than timeout seconds for the events to be delivered."
(delete-directory temporary-file-directory t)) (delete-directory temporary-file-directory t))
;; 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)))
;; Cleanup. ;; Cleanup.
(file-notify--test-cleanup))) (file-notify--test-cleanup)))
@ -763,10 +764,7 @@ longer than timeout seconds for the events to be delivered."
(file-notify--test-cleanup)) (file-notify--test-cleanup))
(unwind-protect (unwind-protect
;; The batch-mode operation of w32notify is fragile (there's no (progn
;; input threads to send the message to).
(unless (and noninteractive
(string-equal (file-notify--test-library) "w32notify"))
(setq file-notify--test-tmpfile (setq file-notify--test-tmpfile
(file-name-as-directory (file-notify--test-make-temp-name))) (file-name-as-directory (file-notify--test-make-temp-name)))
(make-directory file-notify--test-tmpfile) (make-directory file-notify--test-tmpfile)
@ -1045,7 +1043,11 @@ the file watch."
directory-files-no-dot-files-regexp 'nosort)) directory-files-no-dot-files-regexp 'nosort))
'deleted) 'deleted)
;; The events of the directory itself. ;; The events of the directory itself.
'(deleted stopped)))) (cond
;; w32notify does not raise `deleted' and `stopped'
;; events for the watched directory.
((string-equal (file-notify--test-library) "w32notify") '())
(t '(deleted stopped))))))
(delete-directory file-notify--test-tmpfile 'recursive)) (delete-directory file-notify--test-tmpfile 'recursive))
(should-not (file-notify-valid-p file-notify--test-desc1)) (should-not (file-notify-valid-p file-notify--test-desc1))
(should-not (file-notify-valid-p file-notify--test-desc2))) (should-not (file-notify-valid-p file-notify--test-desc2)))
@ -1065,7 +1067,12 @@ the file watch."
;; TODO: ;; TODO:
;; * For w32notify, no stopped events arrive when a directory is removed. ;; * kqueue does not send all expected `deleted' events. Maybe due to
;; the missing directory monitor.
;; * For w32notify, no `deleted' and `stopped' events arrive when a
;; directory is removed.
;; * For w32notify, no `attribute-changed' events arrive. Its sends
;; `changed' events instead.
;; * Check, why cygwin recognizes only `deleted' and `stopped' events. ;; * Check, why cygwin recognizes only `deleted' and `stopped' events.
(provide 'file-notify-tests) (provide 'file-notify-tests)