diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2019-06-14 19:45:00 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2019-06-14 19:45:00 +0200 |
| commit | 0518e3ca98e0d6d5d96323d4f4a2246b60fe28d9 (patch) | |
| tree | e39cc32c0e1c4874c3bb32d71e18f8e0bae59037 /test/lisp/filenotify-tests.el | |
| parent | 1d2e4d22c922f94d6f4b75a5ead18cbc679c5dfe (diff) | |
| download | emacs-0518e3ca98e0d6d5d96323d4f4a2246b60fe28d9.tar.gz | |
Fix problem in remote file notification
* lisp/net/tramp-sh.el (tramp-sh-gio-monitor-process-filter)
(tramp-sh-gvfs-monitor-dir-process-filter)
(tramp-sh-inotifywait-process-filter): Do not kill the process.
Let `file-notify-rm-watch' do the job.
* test/lisp/filenotify-tests.el (file-notify-test03-events)
(file-notify-test05-file-validity)
(file-notify-test09-watched-file-in-watched-dir): Do not
special-case remote files.
Diffstat (limited to 'test/lisp/filenotify-tests.el')
| -rw-r--r-- | test/lisp/filenotify-tests.el | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el index 9dfa794e307..4396a693e3a 100644 --- a/test/lisp/filenotify-tests.el +++ b/test/lisp/filenotify-tests.el @@ -687,12 +687,11 @@ delivered." ((getenv "EMACS_EMBA_CI") '(created changed deleted)) ;; There are two `deleted' events, for the file and for - ;; the directory. Except for cygwin, kqueue and remote - ;; files. And cygwin does not raise a `changed' event. + ;; the directory. Except for cygwin and kqueue. And + ;; cygwin does not raise a `changed' event. ((eq system-type 'cygwin) '(created deleted stopped)) - ((or (string-equal (file-notify--test-library) "kqueue") - (file-remote-p temporary-file-directory)) + ((string-equal (file-notify--test-library) "kqueue") '(created changed deleted stopped)) (t '(created changed deleted deleted stopped))) (write-region @@ -743,9 +742,6 @@ delivered." ;; directory are not detected. ((getenv "EMACS_EMBA_CI") '(created changed created changed deleted deleted)) - ;; Remote files return two `deleted' events. - ((file-remote-p temporary-file-directory) - '(created changed created changed deleted deleted stopped)) (t '(created changed created changed deleted deleted deleted stopped))) (write-region @@ -795,13 +791,12 @@ delivered." ((getenv "EMACS_EMBA_CI") '(created changed renamed deleted)) ;; There are two `deleted' events, for the file and for - ;; the directory. Except for cygwin, kqueue and remote - ;; files. And cygwin raises `created' and `deleted' - ;; events instead of a `renamed' event. + ;; the directory. Except for cygwin and kqueue. And + ;; cygwin raises `created' and `deleted' events instead + ;; of a `renamed' event. ((eq system-type 'cygwin) '(created created deleted deleted stopped)) - ((or (string-equal (file-notify--test-library) "kqueue") - (file-remote-p temporary-file-directory)) + ((string-equal (file-notify--test-library) "kqueue") '(created changed renamed deleted stopped)) (t '(created changed renamed deleted deleted stopped))) (write-region @@ -1046,12 +1041,11 @@ delivered." '((deleted stopped) (created deleted stopped))) ;; There are two `deleted' events, for the file and for - ;; the directory. Except for cygwin, kqueue and remote - ;; files. And cygwin does not raise a `changed' event. + ;; the directory. Except for cygwin and kqueue. And + ;; cygwin does not raise a `changed' event. ((eq system-type 'cygwin) '(created deleted stopped)) - ((or (string-equal (file-notify--test-library) "kqueue") - (file-remote-p temporary-file-directory)) + ((string-equal (file-notify--test-library) "kqueue") '(created changed deleted stopped)) (t '(created changed deleted deleted stopped))) (write-region @@ -1415,9 +1409,6 @@ the file watch." ;; directory are not detected. ((getenv "EMACS_EMBA_CI") '()) - ;; Remote files send just one `stopped' event. - ((file-remote-p temporary-file-directory) - '(stopped)) (t '(deleted stopped)))))) (delete-directory file-notify--test-tmpfile 'recursive)) (unless (getenv "EMACS_EMBA_CI") |