summaryrefslogtreecommitdiff
path: root/test/lisp/filenotify-tests.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2018-01-22 09:12:16 +0100
committerMichael Albinus <michael.albinus@gmx.de>2018-01-22 09:12:16 +0100
commitd0fd9809d7574c67a181225fcc1c59afdbb1295c (patch)
tree9f937d58f01f4f353fe6fa9eb766dd01be0f84ea /test/lisp/filenotify-tests.el
parentb3fb0d47c158cb0d1acdce5008628e1d1a337bbb (diff)
downloademacs-d0fd9809d7574c67a181225fcc1c59afdbb1295c.tar.gz
Finish changes in autorevert from commit 530bb2dc68
* lisp/autorevert.el (auto-revert-buffers): Check `auto-revert-timer' being a timerp. * test/lisp/filenotify-tests.el (file-notify-test04-autorevert): Adapt test in order to cover changed behavior of autorevert.
Diffstat (limited to 'test/lisp/filenotify-tests.el')
-rw-r--r--test/lisp/filenotify-tests.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el
index 8745fdc9e50..f2feef6132b 100644
--- a/test/lisp/filenotify-tests.el
+++ b/test/lisp/filenotify-tests.el
@@ -884,8 +884,8 @@ delivered."
;; Stop file notification. Autorevert shall still work via polling.
(file-notify-rm-watch auto-revert-notify-watch-descriptor)
(file-notify--wait-for-events
- timeout (null auto-revert-use-notify))
- (should-not auto-revert-use-notify)
+ timeout (null auto-revert-notify-watch-descriptor))
+ (should auto-revert-use-notify)
(should-not auto-revert-notify-watch-descriptor)
;; Modify file. We wait for two seconds, in order to
@@ -902,7 +902,10 @@ delivered."
(string-match
(format-message "Reverting buffer `%s'." (buffer-name buf))
captured-messages))
- (should (string-match "foo bla" (buffer-string)))))
+ (should (string-match "foo bla" (buffer-string))))
+
+ ;; Stop autorevert, in order to cleanup descriptor.
+ (auto-revert-mode -1))
;; The environment shall be cleaned up.
(file-notify--test-cleanup-p))