From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 4 Sep 2020 12:24:23 +0000 (+0200)
Subject: Backport recent change in tramp-tests.el from master, don't merge
X-Git-Tag: emacs-27.1.90~159
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5489524ab0dfb1854bf43077d9adedf1eb022027;p=emacs.git

Backport recent change in tramp-tests.el from master, don't merge

* test/lisp/net/tramp-tests.el (tramp-test05-expand-file-name):
No need to expect different results in Emacs 28 and later.
---

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 02f436141f9..89d4171ddea 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2057,8 +2057,8 @@ properly.  BODY shall not contain a timeout."
       ;; user "foo" to "/~foo"".  Otherwise, it doesn't expand.
       (should
        (string-equal
-	(substitute-in-file-name
-	 "/method:host:/path/~foo") "/method:host:/path/~foo"))
+	(substitute-in-file-name "/method:host:/path/~foo")
+	"/method:host:/path/~foo"))
       ;; Quoting local part.
       (should
        (string-equal
@@ -2070,12 +2070,12 @@ properly.  BODY shall not contain a timeout."
 	 "/method:host:/:/~foo") "/method:host:/:/~foo"))
       (should
        (string-equal
-	(substitute-in-file-name
-	 "/method:host:/:/path//~foo") "/method:host:/:/path//~foo"))
+	(substitute-in-file-name "/method:host:/:/path//~foo")
+	"/method:host:/:/path//~foo"))
       (should
        (string-equal
-	(substitute-in-file-name
-	 "/method:host:/:/path/~foo") "/method:host:/:/path/~foo")))
+	(substitute-in-file-name "/method:host:/:/path/~foo")
+	"/method:host:/:/path/~foo")))
 
     (let (process-environment)
       (should
@@ -2120,19 +2120,16 @@ properly.  BODY shall not contain a timeout."
       (expand-file-name "/method:host:/path/../file") "/method:host:/file"))
     (should
      (string-equal
-      (expand-file-name "/method:host:/path/.")
-      (if (tramp--test-emacs28-p) "/method:host:/path/" "/method:host:/path")))
+      (expand-file-name "/method:host:/path/.") "/method:host:/path"))
     (should
      (string-equal
       (expand-file-name "/method:host:/path/..") "/method:host:/"))
     (should
      (string-equal
-      (expand-file-name "." "/method:host:/path/")
-      (if (tramp--test-emacs28-p) "/method:host:/path/" "/method:host:/path")))
+      (expand-file-name "." "/method:host:/path/") "/method:host:/path"))
     (should
      (string-equal
-      (expand-file-name "" "/method:host:/path/")
-      (if (tramp--test-emacs28-p) "/method:host:/path/" "/method:host:/path")))
+      (expand-file-name "" "/method:host:/path/") "/method:host:/path"))
     ;; Quoting local part.
     (should
      (string-equal