From fde614f4cc531f778ba082b0f29a7422be8ea433 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 20 Aug 2019 21:32:34 +0200 Subject: [PATCH] Another attempt to fix bug#32645 * test/lisp/autorevert-tests.el () (auto-revert-test02-auto-revert-deleted-file): * test/lisp/filenotify-tests.el (file-notify-test04-autorevert): Check `file-notify-valid-p', not that the descriptor is nil. --- test/lisp/autorevert-tests.el | 6 ++++-- test/lisp/filenotify-tests.el | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/lisp/autorevert-tests.el b/test/lisp/autorevert-tests.el index c024739f6e5..0ff3c5a4071 100644 --- a/test/lisp/autorevert-tests.el +++ b/test/lisp/autorevert-tests.el @@ -283,7 +283,8 @@ This expects `auto-revert--messages' to be bound by (write-region "any text" nil tmpfile nil 'no-message) (setq buf (find-file-noselect tmpfile)) (with-current-buffer buf - (should-not auto-revert-notify-watch-descriptor) + (should-not + (file-notify-valid-p auto-revert-notify-watch-descriptor)) (should (string-equal (buffer-string) "any text")) ;; `buffer-stale--default-function' checks for ;; `verify-visited-file-modtime'. We must ensure that @@ -314,7 +315,8 @@ This expects `auto-revert--messages' to be bound by ;; With w32notify, and on emba, the `stopped' events are not sent. (or (eq file-notify--library 'w32notify) (getenv "EMACS_EMBA_CI") - (should-not auto-revert-notify-watch-descriptor)) + (should-not + (file-notify-valid-p auto-revert-notify-watch-descriptor))) ;; Once the file has been recreated, the buffer shall be ;; reverted. diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el index 2027299197b..0b6e66e73a6 100644 --- a/test/lisp/filenotify-tests.el +++ b/test/lisp/filenotify-tests.el @@ -946,7 +946,8 @@ delivered." (file-notify--test-wait-for-events timeout (null auto-revert-notify-watch-descriptor)) (should auto-revert-use-notify) - (should-not auto-revert-notify-watch-descriptor) + (should-not + (file-notify-valid-p auto-revert-notify-watch-descriptor)) ;; Modify file. We wait for two seconds, in order to ;; have another timestamp. One second seems to be too -- 2.39.2