* 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.

3 files changed, 11 insertions, 19 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 45844607d34..7d4e9d5e687 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
 2014-04-24  Michael Albinus  <michael.albinus@gmx.de>
 
 	* automated/file-notify-tests.el
diff --git a/test/automated/file-notify-tests.el b/test/automated/file-notify-tests.el
index f3ad6dfbe26..d9a5b039216 100644
--- a/test/automated/file-notify-tests.el
+++ b/test/automated/file-notify-tests.el
@@ -22,7 +22,7 @@
 ;; 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 handler still run, so this test is sufficient
+;; 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
@@ -31,10 +31,6 @@
 ;; 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.
-
 ;; A whole test run can be performed calling the command `file-notify-test-all'.
 
 ;;; Code:
@@ -64,13 +60,10 @@
 (defvar file-notify--test-results nil)
 (defvar file-notify--test-event nil)
 
-(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 59a7c152a1a..2640ee9cef5 100644
--- a/test/automated/tramp-tests.el
+++ b/test/automated/tramp-tests.el
@@ -24,7 +24,7 @@
 ;; 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 handler still run, so this test is sufficient
+;; 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
@@ -33,10 +33,6 @@
 ;; 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.
-
 ;; A whole test run can be performed calling the command `tramp-test-all'.
 
 ;;; Code:
@@ -73,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))