From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 5 Jan 2019 11:21:43 +0000 (+0100)
Subject: * test/lisp/filenotify-tests.el (file-notify-test03-events)
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fa292c6c46b4be54fdbece01cf163d7d1130b345;p=emacs.git

* test/lisp/filenotify-tests.el (file-notify-test03-events)

(file-notify-test05-file-validity): Adapt tests.
---

diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el
index 6c0e8f14aac..b52eac981da 100644
--- a/test/lisp/filenotify-tests.el
+++ b/test/lisp/filenotify-tests.el
@@ -673,10 +673,8 @@ delivered."
 	(file-notify--test-with-events
 	    (cond
 	     ;; w32notify does not raise `deleted' and `stopped'
-	     ;; events for the watched directory.  Same for inotify on emba.
-	     ((or (string-equal (file-notify--test-library) "w32notify")
-                  (and (string-equal (file-notify--test-library) "inotify")
-                       (getenv "EMACS_EMBA_CI")))
+	     ;; events for the watched directory.
+	     ((string-equal (file-notify--test-library) "w32notify")
 	      '(created changed deleted))
              ;; gvfs-monitor-dir on cygwin does not detect the
              ;; `created' event reliably.
@@ -689,9 +687,14 @@ delivered."
 	     ;; cygwin does not raise a `changed' event.
 	     ((eq system-type 'cygwin)
 	      '(created deleted stopped))
-             ;; Still not all monitors detect both `deleted' events.
-	     (t '((created changed deleted stopped)
-                  (created changed deleted deleted stopped))))
+	     ((string-equal (file-notify--test-library) "kqueue")
+	      '(created changed deleted stopped))
+             ;; inotify on emba does not detect `deleted' and
+             ;; `stopped' events of the directory.
+             ((and (string-equal (file-notify--test-library) "inotify")
+                   (getenv "EMACS_EMBA_CI"))
+              '(created changed deleted))
+	     (t '(created changed deleted deleted stopped)))
 	  (write-region
 	   "any text" nil file-notify--test-tmpfile nil 'no-message)
 	  (file-notify--test-read-event)
@@ -736,6 +739,11 @@ delivered."
 	      '(created created changed changed deleted stopped))
 	     ((string-equal (file-notify--test-library) "kqueue")
 	      '(created changed created changed deleted stopped))
+             ;; inotify on emba does not detect `deleted' and
+             ;; `stopped' events of the directory.
+             ((and (string-equal (file-notify--test-library) "inotify")
+                   (getenv "EMACS_EMBA_CI"))
+              '(created changed created changed deleted deleted))
 	     (t '(created changed created changed
 		  deleted deleted deleted stopped)))
 	  (write-region
@@ -1033,6 +1041,11 @@ delivered."
 	   '(created deleted stopped))
 	  ((string-equal (file-notify--test-library) "kqueue")
 	   '(created changed deleted stopped))
+          ;; inotify on emba does not detect `deleted' and `stopped'
+          ;; events of the directory.
+          ((and (string-equal (file-notify--test-library) "inotify")
+                (getenv "EMACS_EMBA_CI"))
+           '(created changed deleted))
 	  (t '(created changed deleted deleted stopped)))
 	 (write-region
 	  "any text" nil file-notify--test-tmpfile nil 'no-message)