diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2019-01-30 15:30:04 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2019-01-30 15:30:04 +0100 |
| commit | 49e253a0f803b497ee3177c1c346d4e0ac70fdae (patch) | |
| tree | 7d664ed99e0f3e65818743d00d199c41927c8a86 | |
| parent | 4563d1b9fa532d08b4d2b6c0015199d1b552092c (diff) | |
| download | emacs-49e253a0f803b497ee3177c1c346d4e0ac70fdae.tar.gz | |
Fix problem in filenotify-tests
* lisp/net/tramp-sh.el (tramp-sh-handle-file-notify-add-watch):
Adapt `accept-process-output' argument.
* test/lisp/filenotify-tests.el (file-notify--deftest-remote):
Remove :unstable tag.
| -rw-r--r-- | lisp/net/tramp-sh.el | 2 | ||||
| -rw-r--r-- | test/lisp/filenotify-tests.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 5ed75132753..404fae9197e 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -3647,7 +3647,7 @@ Fall back to normal file name handler if no Tramp handler exists." (set-process-filter p filter) ;; There might be an error if the monitor is not supported. ;; Give the filter a chance to read the output. - (while (tramp-accept-process-output p)) + (while (tramp-accept-process-output p 0)) (unless (process-live-p p) (tramp-error p 'file-notify-error "Monitoring not supported for `%s'" file-name)) diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el index ef1271dac42..50036209b0f 100644 --- a/test/lisp/filenotify-tests.el +++ b/test/lisp/filenotify-tests.el @@ -266,7 +266,7 @@ This returns only for the local case and gfilenotify; otherwise it is nil. (declare (indent 1)) `(ert-deftest ,(intern (concat (symbol-name test) "-remote")) () ,docstring - :tags '(:expensive-test :unstable) + :tags '(:expensive-test) :expected-result (or ,expected :passed) (skip-unless (not ,skip)) (let* ((temporary-file-directory |