Minor edits in tramp-tests.el

* test/lisp/net/tramp-tests.el (tramp-test16-file-expand-wildcards)
(tramp-test26-interactive-file-name-completion):
Prefer #'string-lessp over 'string<.
(tramp--test-ange-ftp-p, tramp-test47-read-password)
(tramp-test47-read-otp-password): Use function read syntax.

1 files changed, 18 insertions, 15 deletions

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 8c230f43cf3..7f8b71180d2 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -3460,41 +3460,43 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
             ;; `sort' works destructive.
             (should
              (equal (file-expand-wildcards "*")
-                    (sort (copy-sequence '("foo" "bar" "baz")) 'string<)))
+                    (sort (copy-sequence '("foo" "bar" "baz")) #'string-lessp)))
             (should
              (equal (file-expand-wildcards "ba?")
-                    (sort (copy-sequence '("bar" "baz")) 'string<)))
+                    (sort (copy-sequence '("bar" "baz")) #'string-lessp)))
             (should
              (equal (file-expand-wildcards "ba[rz]")
-                    (sort (copy-sequence '("bar" "baz")) 'string<)))
+                    (sort (copy-sequence '("bar" "baz")) #'string-lessp)))
 
             (should
              (equal
               (file-expand-wildcards "*" 'full)
               (sort
-               (copy-sequence `(,tmp-name2 ,tmp-name3 ,tmp-name4)) 'string<)))
+               (copy-sequence `(,tmp-name2 ,tmp-name3 ,tmp-name4))
+               #'string-lessp)))
             (should
              (equal
               (file-expand-wildcards "ba?" 'full)
-              (sort (copy-sequence `(,tmp-name3 ,tmp-name4)) 'string<)))
+              (sort (copy-sequence `(,tmp-name3 ,tmp-name4)) #'string-lessp)))
             (should
              (equal
               (file-expand-wildcards "ba[rz]" 'full)
-              (sort (copy-sequence `(,tmp-name3 ,tmp-name4)) 'string<)))
+              (sort (copy-sequence `(,tmp-name3 ,tmp-name4)) #'string-lessp)))
 
             (should
              (equal
               (file-expand-wildcards (concat tmp-name1 "/" "*"))
               (sort
-               (copy-sequence `(,tmp-name2 ,tmp-name3 ,tmp-name4)) 'string<)))
+               (copy-sequence `(,tmp-name2 ,tmp-name3 ,tmp-name4))
+               #'string-lessp)))
             (should
              (equal
               (file-expand-wildcards (concat tmp-name1 "/" "ba?"))
-              (sort (copy-sequence `(,tmp-name3 ,tmp-name4)) 'string<)))
+              (sort (copy-sequence `(,tmp-name3 ,tmp-name4)) #'string-lessp)))
             (should
              (equal
               (file-expand-wildcards (concat tmp-name1 "/" "ba[rz]"))
-              (sort (copy-sequence `(,tmp-name3 ,tmp-name4)) 'string<))))
+              (sort (copy-sequence `(,tmp-name3 ,tmp-name4)) #'string-lessp))))
 
         ;; Cleanup.
         (ignore-errors (delete-directory tmp-name1 'recursive))))))
@@ -5252,7 +5254,8 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
                            (member (caddr test-and-result) completions))
                         (should
                          (equal
-                          (caddr test-and-result) (sort completions)))))))))))
+                          (caddr test-and-result)
+                          (sort completions #'string-lessp)))))))))))
 
       ;; Cleanup.
       (when tramp-trace
@@ -7340,7 +7343,7 @@ This requires restrictions of file name syntax."
   "Check, whether Ange-FTP is used."
   (eq
    (tramp-find-foreign-file-name-handler tramp-test-vec)
-   'tramp-ftp-file-name-handler))
+   #'tramp-ftp-file-name-handler))
 
 (defun tramp--test-asynchronous-processes-p ()
   "Whether asynchronous processes tests are run.
@@ -8306,7 +8309,7 @@ process sentinels.  They shall not disturb each other."
       ;; Reading password from auth-source works.  We use the netrc
       ;; backend; the other backends shall behave similar.
       ;; Macro `ert-with-temp-file' was introduced in Emacs 29.1.
-      (with-no-warnings (when (symbol-plist 'ert-with-temp-file)
+      (with-no-warnings (when (symbol-plist #'ert-with-temp-file)
         (tramp-cleanup-connection tramp-test-vec 'keep-debug)
         (setq mocked-input nil)
         (auth-source-forget-all-cached)
@@ -8319,7 +8322,7 @@ process sentinels.  They shall not disturb each other."
             (should (file-exists-p ert-remote-temporary-file-directory))))))
 
       ;; Checking session-timeout.
-      (with-no-warnings (when (symbol-plist 'ert-with-temp-file)
+      (with-no-warnings (when (symbol-plist #'ert-with-temp-file)
         (tramp-cleanup-connection tramp-test-vec 'keep-debug)
         (let ((tramp-connection-properties
                (cons '(nil "session-timeout" 1)
@@ -8395,7 +8398,7 @@ process sentinels.  They shall not disturb each other."
 
       ;; The password shouldn't be read from auth-source.
       ;; Macro `ert-with-temp-file' was introduced in Emacs 29.1.
-      (with-no-warnings (when (symbol-plist 'ert-with-temp-file)
+      (with-no-warnings (when (symbol-plist #'ert-with-temp-file)
         (tramp-cleanup-connection tramp-test-vec 'keep-debug)
         (setq mocked-input nil)
         (auth-source-forget-all-cached)
@@ -8848,7 +8851,7 @@ Since it unloads Tramp, it shall be the last test to run."
           (string-match-p (rx bol "with" (| "tramp" "parsed")) (symbol-name x))
           ;; `tramp-register-archive-file-name-handler' is autoloaded
           ;; in Emacs < 29.1.
-          (not (eq 'tramp-register-archive-file-name-handler x))
+          (not (eq #'tramp-register-archive-file-name-handler x))
           ;; `tramp-compat-rx' is autoloaded in Emacs 29.1.
           (not (eq 'tramp-compat-rx x))
           (not (string-match-p