diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2020-09-04 14:24:23 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2020-09-04 14:24:23 +0200 |
| commit | 5489524ab0dfb1854bf43077d9adedf1eb022027 (patch) | |
| tree | 9b9eb9eaa173b839602512596e8988ef88b296fe /test | |
| parent | c9708e5ba238661fede5a0d6cb175342a9e7fd31 (diff) | |
| download | emacs-5489524ab0dfb1854bf43077d9adedf1eb022027.tar.gz | |
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.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 21 |
1 files changed, 9 insertions, 12 deletions
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 |