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.

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 5ed75132753b570891796522b39cddd57e0b1ac0..404fae9197e653b34efc72478483aabd3a7edc2d 100644 (file)
--- 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 ef1271dac428bcf0e833fc28df8bf00006ecb25e..50036209b0fbf53593b9ec7d0e9650066aec4ca1 100644 (file)
--- 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