aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2015-09-16 20:26:31 +0200
committerMichael Albinus2015-09-16 20:26:31 +0200
commit4969489ce0da37b8f6e589a2c8c95a191ef88091 (patch)
tree01398baa325d0539e825b5b45c13f7fbf386c446
parentd605a539d4863c7e7c66aaea6e538ae14c47f3d7 (diff)
downloademacs-4969489ce0da37b8f6e589a2c8c95a191ef88091.tar.gz
emacs-4969489ce0da37b8f6e589a2c8c95a191ef88091.zip
Adapt test in file-notify-tests.el
* test/automated/file-notify-tests.el (file-notify-test04-file-validity): Skip for w32notify in batch-mode. Add test lost last commit.
-rw-r--r--test/automated/file-notify-tests.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/automated/file-notify-tests.el b/test/automated/file-notify-tests.el
index b962aa7e48f..848225d2387 100644
--- a/test/automated/file-notify-tests.el
+++ b/test/automated/file-notify-tests.el
@@ -377,6 +377,9 @@ Don't wait longer than TIMEOUT seconds for the events to be delivered."
377(ert-deftest file-notify-test04-file-validity () 377(ert-deftest file-notify-test04-file-validity ()
378 "Check `file-notify-valid-p' for files." 378 "Check `file-notify-valid-p' for files."
379 (skip-unless (file-notify--test-local-enabled)) 379 (skip-unless (file-notify--test-local-enabled))
380 ;; The batch-mode operation of w32notify is fragile (there's no
381 ;; input threads to send the message to).
382 (skip-unless (not (and noninteractive (eq file-notify--library 'w32notify))))
380 (unwind-protect 383 (unwind-protect
381 (let ((temporary-file-directory (make-temp-file 384 (let ((temporary-file-directory (make-temp-file
382 "file-notify-test-parent" t))) 385 "file-notify-test-parent" t)))
@@ -396,7 +399,8 @@ Don't wait longer than TIMEOUT seconds for the events to be delivered."
396 ;; After deleting the parent, the descriptor must not be valid 399 ;; After deleting the parent, the descriptor must not be valid
397 ;; anymore. 400 ;; anymore.
398 (delete-directory temporary-file-directory t) 401 (delete-directory temporary-file-directory t)
399 (read-event nil nil 0.5)) 402 (read-event nil nil 0.5)
403 (should-not (file-notify-valid-p file-notify--test-desc)))
400 404
401 ;; Exit. 405 ;; Exit.
402 (file-notify--test-cleanup))) 406 (file-notify--test-cleanup)))