* test/lisp/filenotify-tests.el (file-notify--test-timeout): Change timing.

; * lisp/net/tramp-sh.el (tramp-sh-gio-monitor-process-filter):
; Remove test message.

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 73e0807dbc1e5d89936e4454a6c194612cb69089..255314a99eac8531abf9e407847188c768e951c9 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3740,8 +3740,6 @@ Fall back to normal file name handler if no Tramp handler exists."
                  "changes done" "changes-done-hint" string)
           string (tramp-compat-string-replace
                  "renamed to" "moved" string))
-    (when (getenv "EMACS_EMBA_CI")
-      (message "%s" string))
 
     (catch 'doesnt-work
       ;; https://bugs.launchpad.net/bugs/1742946

diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el
index 4a2f1f9a6765eee40423ede71d14549da1d84bb4..cca8aeb97d40c2025fe6c9d92b68e6ebc87290b1 100644 (file)
--- a/test/lisp/filenotify-tests.el
+++ b/test/lisp/filenotify-tests.el
@@ -117,8 +117,8 @@ There are different timeouts for local and remote file notification libraries."
 (defun file-notify--test-timeout ()
   "Timeout to wait for arriving a bunch of events, in seconds."
   (cond
+   ((file-remote-p temporary-file-directory) 20)
    ((eq system-type 'cygwin) 10)
-   ((file-remote-p temporary-file-directory) 6)
    ((string-equal (file-notify--test-library) "w32notify") 4)
    (t 3)))