From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 16 Sep 2015 18:26:31 +0000 (+0200)
Subject: Adapt test in file-notify-tests.el
X-Git-Tag: emacs-25.0.90~1224^2~100
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4969489ce0da37b8f6e589a2c8c95a191ef88091;p=emacs.git

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.
---

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."
 (ert-deftest file-notify-test04-file-validity ()
   "Check `file-notify-valid-p' for files."
   (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
       (let ((temporary-file-directory (make-temp-file
                                        "file-notify-test-parent" t)))
@@ -396,7 +399,8 @@ Don't wait longer than TIMEOUT seconds for the events to be delivered."
         ;; After deleting the parent, the descriptor must not be valid
         ;; anymore.
         (delete-directory temporary-file-directory t)
-        (read-event nil nil 0.5))
+        (read-event nil nil 0.5)
+        (should-not (file-notify-valid-p file-notify--test-desc)))
 
     ;; Exit.
     (file-notify--test-cleanup)))