Merge from emacs-24; up to 2014-04-25T10:35:01Z!michael.albinus@gmx.de

4 files changed, 61 insertions, 31 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 7652e71f5c3..afc05d338a9 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,17 @@
+2014-04-25  Michael Albinus  <michael.albinus@gmx.de>
+
+        * automated/tramp-tests.el (top):
+        * automated/file-notify-tests.el (top): Do not disable interactive
+        passwords in batch mode.
+        (password-cache-expiry): Set to nil.
+
+        * automated/file-notify-tests.el
+        (file-notify-test-remote-temporary-file-directory):
+        * automated/tramp-tests.el (tramp-test-temporary-file-directory):
+        Use a mock-up method as default.
+        (tramp-test00-availability): Print the used directory name.
+        (tramp-test33-recursive-load): Fix typo.
+
 2014-04-22  Michael Albinus  <michael.albinus@gmx.de>
 
         * automated/tramp-tests.el (tramp--test-check-files): Remove traces.
diff --git a/test/automated/file-notify-tests.el b/test/automated/file-notify-tests.el
index f1d9aee974c..d9a5b039216 100644
--- a/test/automated/file-notify-tests.el
+++ b/test/automated/file-notify-tests.el
@@ -19,15 +19,17 @@
 
 ;;; Commentary:
 
-;; Some of the tests require access to a remote host files.  Set
-;; $REMOTE_TEMPORARY_FILE_DIRECTORY to a suitable value in order
-;; to overwrite the default value.  If you want to skip tests
-;; accessing a remote host, set this environment variable to
-;; "/dev/null" or whatever is appropriate on your system.
-
-;; When running the tests in batch mode, it must NOT require an
-;; interactive password prompt unless the environment variable
-;; $REMOTE_ALLOW_PASSWORD is set.
+;; Some of the tests require access to a remote host files.  Since
+;; this could be problematic, a mock-up connection method "mock" is
+;; used.  Emulating a remote connection, it simply calls "sh -i".
+;; Tramp's file name handlers still run, so this test is sufficient
+;; except for connection establishing.
+
+;; If you want to test a real Tramp connection, set
+;; $REMOTE_TEMPORARY_FILE_DIRECTORY to a suitable value in order to
+;; overwrite the default value.  If you want to skip tests accessing a
+;; remote host, set this environment variable to "/dev/null" or
+;; whatever is appropriate on your system.
 
 ;; A whole test run can be performed calling the command `file-notify-test-all'.
 
@@ -35,13 +37,22 @@
 
 (require 'ert)
 (require 'filenotify)
+(require 'tramp)
 
 ;; There is no default value on w32 systems, which could work out of the box.
 (defconst file-notify-test-remote-temporary-file-directory
   (cond
    ((getenv "REMOTE_TEMPORARY_FILE_DIRECTORY"))
    ((eq system-type 'windows-nt) null-device)
-   (t (format "/ssh::%s" temporary-file-directory)))
+   (t (add-to-list
+       'tramp-methods
+       '("mock"
+         (tramp-login-program        "sh")
+         (tramp-login-args           (("-i")))
+         (tramp-remote-shell         "/bin/sh")
+         (tramp-remote-shell-args    ("-c"))
+         (tramp-connection-timeout   10)))
+      (format "/mock::%s" temporary-file-directory)))
   "Temporary directory for Tramp tests.")
 
 (defvar file-notify--test-tmpfile nil)
@@ -49,14 +60,10 @@
 (defvar file-notify--test-results nil)
 (defvar file-notify--test-event nil)
 
-(require 'tramp)
-(setq tramp-verbose 0
+(setq password-cache-expiry nil
+      tramp-verbose 0
       tramp-message-show-message nil)
 
-;; Disable interactive passwords in batch mode.
-(when (and noninteractive (not (getenv "REMOTE_ALLOW_PASSWORD")))
-  (defalias 'tramp-read-passwd 'ignore))
-
 ;; This shall happen on hydra only.
 (when (getenv "NIX_STORE")
   (add-to-list 'tramp-remote-path 'tramp-own-remote-path))
diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el
index b6e757d3ae5..2640ee9cef5 100644
--- a/test/automated/tramp-tests.el
+++ b/test/automated/tramp-tests.el
@@ -21,15 +21,17 @@
 
 ;; The tests require a recent ert.el from Emacs 24.4.
 
-;; Some of the tests require access to a remote host files.  Set
-;; $REMOTE_TEMPORARY_FILE_DIRECTORY to a suitable value in order
-;; to overwrite the default value.  If you want to skip tests
-;; accessing a remote host, set this environment variable to
-;; "/dev/null" or whatever is appropriate on your system.
-
-;; When running the tests in batch mode, it must NOT require an
-;; interactive password prompt unless the environment variable
-;; $REMOTE_ALLOW_PASSWORD is set.
+;; Some of the tests require access to a remote host files.  Since
+;; this could be problematic, a mock-up connection method "mock" is
+;; used.  Emulating a remote connection, it simply calls "sh -i".
+;; Tramp's file name handlers still run, so this test is sufficient
+;; except for connection establishing.
+
+;; If you want to test a real Tramp connection, set
+;; $REMOTE_TEMPORARY_FILE_DIRECTORY to a suitable value in order to
+;; overwrite the default value.  If you want to skip tests accessing a
+;; remote host, set this environment variable to "/dev/null" or
+;; whatever is appropriate on your system.
 
 ;; A whole test run can be performed calling the command `tramp-test-all'.
 
@@ -51,7 +53,15 @@
   (cond
    ((getenv "REMOTE_TEMPORARY_FILE_DIRECTORY"))
    ((eq system-type 'windows-nt) null-device)
-   (t (format "/ssh::%s" temporary-file-directory)))
+   (t (add-to-list
+       'tramp-methods
+       '("mock"
+         (tramp-login-program        "sh")
+         (tramp-login-args           (("-i")))
+         (tramp-remote-shell         "/bin/sh")
+         (tramp-remote-shell-args    ("-c"))
+         (tramp-connection-timeout   10)))
+      (format "/mock::%s" temporary-file-directory)))
   "Temporary directory for Tramp tests.")
 
 (setq password-cache-expiry nil
@@ -59,10 +69,6 @@
       tramp-copy-size-limit nil
       tramp-message-show-message nil)
 
-;; Disable interactive passwords in batch mode.
-(when (and noninteractive (not (getenv "REMOTE_ALLOW_PASSWORD")))
-  (defalias 'tramp-read-passwd 'ignore))
-
 ;; This shall happen on hydra only.
 (when (getenv "NIX_STORE")
   (add-to-list 'tramp-remote-path 'tramp-own-remote-path))
@@ -127,6 +133,7 @@ eval properly in `should', `should-not' or `should-error'."
 (ert-deftest tramp-test00-availability ()
   "Test availability of Tramp functions."
   :expected-result (if (tramp--test-enabled) :passed :failed)
+  (message "Remote directory: `%s'" tramp-test-temporary-file-directory)
   (should (ignore-errors
             (and
              (file-remote-p tramp-test-temporary-file-directory)
@@ -1589,7 +1596,7 @@ process sentinels.  They shall not disturb each other."
   (dolist (code
            (list
             (format
-             "(expand-file-name %S))"
+             "(expand-file-name %S)"
              tramp-test-temporary-file-directory)
             (format
              "(let ((default-directory %S)) (expand-file-name %S))"
diff --git a/test/indent/perl.perl b/test/indent/perl.perl
index 7cb877b0a95..c7a2fbfb2d2 100755
--- a/test/indent/perl.perl
+++ b/test/indent/perl.perl
@@ -1,6 +1,8 @@
 #!/usr/bin/perl
 # -*- eval: (bug-reference-mode 1) -*-
 
+if ($c && /====/){xyz;}
+
 print <<"EOF1" . s/he"llo/th'ere/;
 foo
 EOF2