[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-27 5489524: Backport recent change in tramp-tests.el from master,
From: |
Michael Albinus |
Subject: |
emacs-27 5489524: Backport recent change in tramp-tests.el from master, don't merge |
Date: |
Fri, 4 Sep 2020 08:24:31 -0400 (EDT) |
branch: emacs-27
commit 5489524ab0dfb1854bf43077d9adedf1eb022027
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
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.
---
test/lisp/net/tramp-tests.el | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 02f4361..89d4171 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-27 5489524: Backport recent change in tramp-tests.el from master, don't merge,
Michael Albinus <=