More adaptations in file-notify-tests.el

* test/automated/file-notify-tests.el
(file-notify-test05-dir-validity): Skip for w32notify in
batch-mode.  (Bug#21432)

diff --git a/test/automated/file-notify-tests.el b/test/automated/file-notify-tests.el
index 848225d23871abae4a0233acb3e3719daaeb61d7..dfc32443d171c5a9681636c333eb63a487d1dede 100644 (file)
--- a/test/automated/file-notify-tests.el
+++ b/test/automated/file-notify-tests.el
@@ -411,6 +411,9 @@ Don't wait longer than TIMEOUT seconds for the events to be delivered."
 (ert-deftest file-notify-test05-dir-validity ()
   "Check `file-notify-valid-p' for directories."
   (skip-unless (file-notify--test-local-enabled))
+  ;; The batch-mode operation of w32notify is fragile (there's no
+  ;; input threads to send the message to).
+  (skip-unless (not (and noninteractive (eq file-notify--library 'w32notify))))
   (unwind-protect
       (progn
         (setq file-notify--test-tmpfile (file-name-as-directory