summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2016-02-05 23:56:14 +0200
committerEli Zaretskii <eliz@gnu.org>2016-02-05 23:56:14 +0200
commit1fbcc8ad08cf94653f0e28b1e83c45f21c0f3ece (patch)
treec603b0b211eeeb531600a74239a180636827a969
parentc1d32a65372c72d7de4808d620eefd3214a8e92a (diff)
parent1eaf68f3689c49ee1d191ad3154563a365f7cf05 (diff)
downloademacs-1fbcc8ad08cf94653f0e28b1e83c45f21c0f3ece.tar.gz
emacs-1fbcc8ad08cf94653f0e28b1e83c45f21c0f3ece.tar.bz2
emacs-1fbcc8ad08cf94653f0e28b1e83c45f21c0f3ece.zip
Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
-rw-r--r--test/automated/file-notify-tests.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/automated/file-notify-tests.el b/test/automated/file-notify-tests.el
index de64f5086d2..629d85be1ef 100644
--- a/test/automated/file-notify-tests.el
+++ b/test/automated/file-notify-tests.el
@@ -596,7 +596,7 @@ longer than timeout seconds for the events to be delivered."
(should (string-match "another text" (buffer-string)))
;; Stop file notification. Autorevert shall still work via polling.
- ;; It doesn't work for `w32notify'.
+ ;; It doesn't work for w32notify.
(unless (string-equal (file-notify--test-library) "w32notify")
(file-notify-rm-watch auto-revert-notify-watch-descriptor)
(file-notify--wait-for-events
@@ -797,7 +797,10 @@ longer than timeout seconds for the events to be delivered."
file-notify--test-tmpfile
'(change) 'file-notify--test-event-handler)))
(unwind-protect
- (let ((n 1000)
+ ;; In case of w32notify, the upper limit of events to handle
+ ;; seems to be 260. Reason unknown.
+ (let ((n (if (string-equal (file-notify--test-library) "w32notify")
+ 250 1000))
source-file-list target-file-list
(default-directory file-notify--test-tmpfile))
(dotimes (i n)