[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 49e253a 2/2: Fix problem in filenotify-tests
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master 49e253a 2/2: Fix problem in filenotify-tests |
Date: |
Wed, 30 Jan 2019 09:30:13 -0500 (EST) |
branch: master
commit 49e253a0f803b497ee3177c1c346d4e0ac70fdae
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
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.
---
lisp/net/tramp-sh.el | 2 +-
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 5ed7513..404fae9 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 ef1271d..5003620 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