procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* test/lisp/net/tramp-tests.el (tramp-test05-expand-file-name):
No need to expect different results in Emacs 28 and later.
This commit is contained in:
Michael Albinus 2020-09-04 14:24:23 +02:00
parent c9708e5ba2
commit 5489524ab0
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
test/lisp/net/tramp-tests.el
View file

@ -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