Commit 20b177d5 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix the file-notify tests for watch validation on w32

* test/automated/file-notify-tests.el
(file-notify-test04-file-validity): Move the directory deletion
out of the file-notify--test-with-events macro.
(file-notify-test04-file-validity)
(file-notify-test05-dir-validity): Enlarge the timeout of
read-event to 0.5, as 0.1 is borderline on w32.  (Bug#21432)
parent 40d3a151
......@@ -386,17 +386,17 @@ Don't wait longer than TIMEOUT seconds for the events to be delivered."
'(change)
#'file-notify--test-event-handler))
(file-notify--test-with-events
3 3 (lambda (events)
(should (equal '(created changed deleted)
2 3 (lambda (events)
(should (equal '(created changed)
(mapcar #'cadr events))))
(should (file-notify-valid-p file-notify--test-desc))
(write-region
"any text" nil file-notify--test-tmpfile nil 'no-message)
(should (file-notify-valid-p file-notify--test-desc))
(delete-directory temporary-file-directory t))
(should (file-notify-valid-p file-notify--test-desc)))
;; After deleting the parent, the descriptor must not be valid
;; anymore.
(should-not (file-notify-valid-p file-notify--test-desc)))
(delete-directory temporary-file-directory t)
(read-event nil nil 0.5))
;; Exit.
(file-notify--test-cleanup)))
......@@ -420,7 +420,7 @@ Don't wait longer than TIMEOUT seconds for the events to be delivered."
(delete-directory file-notify--test-tmpfile t)
;; After deleting the directory, the descriptor must not be
;; valid anymore.
(read-event nil nil 0.1)
(read-event nil nil 0.5)
(should-not (file-notify-valid-p file-notify--test-desc)))
;; Exit.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment