Fix Tramp IPv6 handling in tests

* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection): Improve message.

* lisp/net/tramp-integration.el (shortdoc): Add further examples of
`file-remote-p'.

* lisp/net/tramp.el (tramp-handle-file-remote-p): Extend docstring.

* test/lisp/net/tramp-tests.el (tramp-test02-file-name-dissect)
(tramp-test02-file-name-dissect-simplified)
(tramp-test02-file-name-dissect-separate): Extend tests.
(tramp-test06-directory-file-name)
(tramp-test26-file-name-completion)
(tramp-test26-interactive-file-name-completion): Better handling
of IPv6 hosts.

1 files changed, 55 insertions, 27 deletions

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 786700c727e..e958cd354bc 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -848,19 +848,20 @@ is greater than 10.
           (should (string-equal (file-remote-p "/method:[::1]:" 'localname) ""))
           (should (string-equal (file-remote-p "/method:[::1]:" 'hop) nil))
 
-          ;; No expansion.
+          ;; No expansion.  Hop.
           (should (string-equal
-                   (file-remote-p "/method:user@[::1]:")
-                   (format "/%s:%s@%s:" "method" "user" "[::1]")))
+                   (file-remote-p "/method:user@[::1]#1234:")
+                   (format "/%s:%s@%s#%s:" "method" "user" "[::1]" "1234")))
           (should (string-equal
-                   (file-remote-p "/method:user@[::1]:" 'method) "method"))
-          (should
-           (string-equal (file-remote-p "/method:user@[::1]:" 'user) "user"))
-          (should
-           (string-equal (file-remote-p "/method:user@[::1]:" 'host) "::1"))
+                   (file-remote-p "/method:user@[::1]#1234:" 'method) "method"))
+          (should (string-equal (file-remote-p "/method:user@[::1]#1234:" 'user)
+                                "user"))
+          (should (string-equal
+                   (file-remote-p "/method:user@[::1]#1234:" 'host) "::1#1234"))
           (should (string-equal
-                   (file-remote-p "/method:user@[::1]:" 'localname) ""))
-          (should (string-equal (file-remote-p "/method:user@[::1]:" 'hop) nil))
+                   (file-remote-p "/method:user@[::1]#1234:" 'localname) ""))
+          (should (string-equal
+                   (file-remote-p "/method:user@[::1]#1234:" 'hop) nil))
 
           ;; Local file name part.
           (should (string-equal (file-remote-p "/-:host:/:" 'localname) "/:"))
@@ -1244,6 +1245,20 @@ is greater than 10.
           (should (string-equal (file-remote-p "/user@[::1]:" 'localname) ""))
           (should (string-equal (file-remote-p "/user@[::1]:" 'hop) nil))
 
+          ;; No expansion.  Hop.
+          (should (string-equal
+                   (file-remote-p "/user@[::1]#1234:")
+                   (format "/%s@%s#%s:" "user" "[::1]" "1234")))
+          (should (string-equal
+                   (file-remote-p "/user@[::1]#1234:" 'method) "default-method"))
+          (should
+           (string-equal (file-remote-p "/user@[::1]#1234:" 'user) "user"))
+          (should
+           (string-equal (file-remote-p "/user@[::1]#1234:" 'host) "::1#1234"))
+          (should
+           (string-equal (file-remote-p "/user@[::1]#1234:" 'localname) ""))
+          (should (string-equal (file-remote-p "/user@[::1]#1234:" 'hop) nil))
+
           ;; Local file name part.
           (should (string-equal (file-remote-p "/host:/:" 'localname) "/:"))
           (should (string-equal (file-remote-p "/host::" 'localname) ":"))
@@ -1886,19 +1901,20 @@ is greater than 10.
           (should (string-equal (file-remote-p "/[method/::1]" 'localname) ""))
           (should (string-equal (file-remote-p "/[method/::1]" 'hop) nil))
 
-          ;; No expansion.
+          ;; No expansion.  Hop.
+          (should (string-equal
+                   (file-remote-p "/[method/user@::1#1234]")
+                   (format "/[%s/%s@%s#%s]" "method" "user" "::1" "1234")))
           (should (string-equal
-                   (file-remote-p "/[method/user@::1]")
-                   (format "/[%s/%s@%s]" "method" "user" "::1")))
+                   (file-remote-p "/[method/user@::1#1234]" 'method) "method"))
           (should (string-equal
-                   (file-remote-p "/[method/user@::1]" 'method) "method"))
+                   (file-remote-p "/[method/user@::1#1234]" 'user) "user"))
           (should (string-equal
-                   (file-remote-p "/[method/user@::1]" 'user) "user"))
+                   (file-remote-p "/[method/user@::1#1234]" 'host) "::1#1234"))
           (should (string-equal
-                   (file-remote-p "/[method/user@::1]" 'host) "::1"))
+                   (file-remote-p "/[method/user@::1#1234]" 'localname) ""))
           (should (string-equal
-                   (file-remote-p "/[method/user@::1]" 'localname) ""))
-          (should (string-equal (file-remote-p "/[method/user@::1]" 'hop) nil))
+                   (file-remote-p "/[method/user@::1#1234]" 'hop) nil))
 
           ;; Local file name part.
           (should (string-equal (file-remote-p "/[/host]/:" 'localname) "/:"))
@@ -2425,16 +2441,22 @@ This checks also `file-name-as-directory', `file-name-directory',
       ;; which ruins the tests.
       (let ((tramp-default-method
              (file-remote-p ert-remote-temporary-file-directory 'method))
-            (host (file-remote-p ert-remote-temporary-file-directory 'host)))
+            (host-port
+             (file-remote-p ert-remote-temporary-file-directory 'host)))
         (dolist
             (file
              `(,(format "/%s::" tramp-default-method)
                ,(format
                  "/-:%s:"
-                 (if (string-match-p tramp-ipv6-regexp host)
-                     (concat
-                      tramp-prefix-ipv6-format host tramp-postfix-ipv6-format)
-                   host))))
+                 ;; `(file-remote-p ... 'host)' eliminates IPv6
+                 ;; delimiters.  Add them.
+                 (if (string-match tramp-ipv6-regexp host-port)
+                     (replace-match
+                      (format
+                       "%s\\&%s"
+                       tramp-prefix-ipv6-format tramp-postfix-ipv6-format)
+                      nil nil host-port)
+                   host-port))))
           (should (string-equal (directory-file-name file) file))
           (should
            (string-equal
@@ -4796,8 +4818,11 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
         (host (file-remote-p ert-remote-temporary-file-directory 'host))
         (orig-syntax tramp-syntax)
         (minibuffer-completing-file-name t))
-    (when (and (stringp host) (string-match tramp-host-with-port-regexp host))
-      (setq host (match-string 1 host)))
+    (when (and (stringp host)
+               (string-match
+                (rx (regexp tramp-prefix-port-regexp) (regexp tramp-port-regexp))
+                host))
+      (setq host (replace-match "" nil nil host)))
 
     (unwind-protect
         (dolist (syntax (if (tramp--test-expensive-test-p)
@@ -4930,8 +4955,11 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
         (orig-syntax tramp-syntax)
         (non-essential t)
         (inhibit-message t))
-    (when (and (stringp host) (string-match tramp-host-with-port-regexp host))
-      (setq host (match-string 1 host)))
+    (when (and (stringp host)
+               (string-match
+                (rx (regexp tramp-prefix-port-regexp) (regexp tramp-port-regexp))
+                host))
+      (setq host (replace-match "" nil nil host)))
 
     ;; (trace-function #'tramp-completion-file-name-handler)
     ;; (trace-function #'completion-file-name-table)