[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113641: * test/automated/file-notify-tests.el (file
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r113641: * test/automated/file-notify-tests.el (file-notify--test-remote-enabled): |
Date: |
Thu, 01 Aug 2013 23:10:55 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113641
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2013-08-01 19:10:51 -0400
message:
* test/automated/file-notify-tests.el (file-notify--test-remote-enabled):
Try to check that the remote system has a notification program.
modified:
test/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-8588
test/automated/file-notify-tests.el
filenotifytests.el-20130702144123-sxglvo6zs3jcj8w1-1
=== modified file 'test/ChangeLog'
--- a/test/ChangeLog 2013-07-31 07:08:47 +0000
+++ b/test/ChangeLog 2013-08-01 23:10:51 +0000
@@ -1,3 +1,8 @@
+2013-08-01 Glenn Morris <address@hidden>
+
+ * automated/file-notify-tests.el (file-notify--test-remote-enabled):
+ Try to check that the remote system has a notification program.
+
2013-07-31 Glenn Morris <address@hidden>
* automated/undo-tests.el (undo-test2, undo-test5): Be quieter.
=== modified file 'test/automated/file-notify-tests.el'
--- a/test/automated/file-notify-tests.el 2013-07-24 13:56:19 +0000
+++ b/test/automated/file-notify-tests.el 2013-08-01 23:10:51 +0000
@@ -43,6 +43,7 @@
(defvar file-notify--test-event nil)
(require 'tramp)
+(require 'tramp-sh)
(setq tramp-verbose 0
tramp-message-show-message nil)
(when noninteractive (defalias 'tramp-read-passwd 'ignore))
@@ -57,7 +58,18 @@
(ignore-errors
(and (file-remote-p file-notify-test-remote-temporary-file-directory)
(file-directory-p file-notify-test-remote-temporary-file-directory)
- (file-writable-p file-notify-test-remote-temporary-file-directory))))
+ (file-writable-p file-notify-test-remote-temporary-file-directory)
+ ;; Extracted from tramp-sh-handle-file-notify-add-watch.
+ ;; Even though the "remote" system is just address@hidden,
+ ;; the PATH might not be the same as the "local" PATH.
+ ;; Eg this seems to be the case on hydra.nixos.org.
+ ;; Without this, tests fail with:
+ ;; "No file notification program found on /ssh:localhost:"
+ ;; Try to fix PATH instead?
+ (with-parsed-tramp-file-name
+ file-notify-test-remote-temporary-file-directory nil
+ (or (tramp-get-remote-gvfs-monitor-dir v)
+ (tramp-get-remote-inotifywait v))))))
(defmacro file-notify--deftest-remote (test docstring)
"Define ert `TEST-remote' for remote files."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113641: * test/automated/file-notify-tests.el (file-notify--test-remote-enabled):,
Glenn Morris <=