mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

Minor cleanup in {autorevert,filenotify,shadowfile}-tests.el

Browse source 
* test/lisp/autorevert-tests.el (tramp-message-show-message):
* test/lisp/shadowfile-tests.el (tramp-message-show-message):
* test/lisp/filenotify-tests.el (tramp-message-show-message)
Do Not set.
(file-notify-test04-autorevert): Inhibit messages.
This commit is contained in:
Michael Albinus 2020-01-22 11:45:26 +01:00
parent abb2515b0c
commit 63f69e935e
3 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/lisp/autorevert-tests.el
View file

@ -59,8 +59,7 @@
auto-revert-notify-exclude-dir-regexp "nothing-to-be-excluded"
auto-revert-stop-on-user-input nil
file-notify-debug nil
tramp-verbose 0
tramp-message-show-message nil)
tramp-verbose 0)
(defconst auto-revert--timeout (1+ auto-revert-interval)
"Time to wait for a message.")

45
test/lisp/filenotify-tests.el
View file

@ -200,8 +200,7 @@ Return nil when any other file notification watch is still active."
(setq file-notify-debug nil
password-cache-expiry nil
tramp-verbose 0
tramp-message-show-message nil)
tramp-verbose 0)
;; This should happen on hydra only.
(when (getenv "EMACS_HYDRA_CI")
@ -929,17 +928,18 @@ delivered."
;; Modify file. We wait for a second, in order to have
;; another timestamp.
(ert-with-message-capture captured-messages
(sleep-for 1)
(write-region
"another text" nil file-notify--test-tmpfile nil 'no-message)
(let ((inhibit-message t))
(sleep-for 1)
(write-region
"another text" nil file-notify--test-tmpfile nil 'no-message)
;; Check, that the buffer has been reverted.
(file-notify--test-wait-for-events
timeout
(string-match
(format-message "Reverting buffer `%s'." (buffer-name buf))
captured-messages))
(should (string-match "another text" (buffer-string))))
;; Check, that the buffer has been reverted.
(file-notify--test-wait-for-events
timeout
(string-match
(format-message "Reverting buffer `%s'." (buffer-name buf))
captured-messages))
(should (string-match "another text" (buffer-string)))))
;; Stop file notification. Autorevert shall still work via polling.
(file-notify-rm-watch auto-revert-notify-watch-descriptor)
@ -953,17 +953,18 @@ delivered."
;; have another timestamp. One second seems to be too
;; short. And Cygwin sporadically requires more than two.
(ert-with-message-capture captured-messages
(sleep-for (if (eq system-type 'cygwin) 3 2))
(write-region
"foo bla" nil file-notify--test-tmpfile nil 'no-message)
(let ((inhibit-message t))
(sleep-for (if (eq system-type 'cygwin) 3 2))
(write-region
"foo bla" nil file-notify--test-tmpfile nil 'no-message)
;; Check, that the buffer has been reverted.
(file-notify--test-wait-for-events
timeout
(string-match
(format-message "Reverting buffer `%s'." (buffer-name buf))
captured-messages))
(should (string-match "foo bla" (buffer-string))))
;; Check, that the buffer has been reverted.
(file-notify--test-wait-for-events
timeout
(string-match
(format-message "Reverting buffer `%s'." (buffer-name buf))
captured-messages))
(should (string-match "foo bla" (buffer-string)))))
;; Stop autorevert, in order to cleanup descriptor.
(auto-revert-mode -1))

1
test/lisp/shadowfile-tests.el
View file

@ -70,7 +70,6 @@
(setq password-cache-expiry nil
shadow-debug (getenv "EMACS_HYDRA_CI")
tramp-verbose 0
tramp-message-show-message nil
;; On macOS, `temporary-file-directory' is a symlinked directory.
temporary-file-directory (file-truename temporary-file-directory)
shadow-test-remote-temporary-file-directory