From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 27 Apr 2022 18:15:07 +0000 (+0200)
Subject: Improve tramp-test46-read-password
X-Git-Tag: emacs-29.0.90~1931^2~260
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=77f00c019ce48ad90cccd1ffe9981b33b5e82416;p=emacs.git

Improve tramp-test46-read-password

* test/lisp/net/tramp-tests.el (tramp-test46-read-password): Add a
further check.
---

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index b27b735eb57..d8709709457 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -7307,8 +7307,12 @@ process sentinels.  They shall not disturb each other."
   :tags '(:expensive-test)
   (skip-unless (tramp--test-enabled))
   (skip-unless (tramp--test-mock-p))
+  ;; Not all read commands understand argument "-s" or "-p".
+  (skip-unless
+   (string-empty-p
+    (let ((shell-file-name "sh"))
+      (shell-command-to-string "read -s -p Password: pass"))))
 
-  (tramp--test-instrument-test-case 10
   (let ((pass "secret")
 	(mock-entry (copy-sequence (assoc "mock" tramp-methods)))
 	mocked-input tramp-methods)
@@ -7355,7 +7359,7 @@ process sentinels.  They shall not disturb each other."
 		 "machine %s port mock password %s"
 		 (file-remote-p tramp-test-temporary-file-directory 'host) pass)
 	  (let ((auth-sources `(,netrc-file)))
-	    (should (file-exists-p tramp-test-temporary-file-directory))))))))))
+	    (should (file-exists-p tramp-test-temporary-file-directory)))))))))
 
 ;; This test is inspired by Bug#29163.
 (ert-deftest tramp-test47-auto-load ()