From df5c669709c318807e5b718f65796171287bf36c Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 27 Aug 2020 20:15:40 +0200 Subject: [PATCH] Adapt tramp-tests.el, don't merge with master * test/lisp/net/tramp-tests.el (tramp-test05-expand-file-name) (tramp-test05-expand-file-name-relative): Adapt tests. (tramp--test-emacs28-p): New defun. --- test/lisp/net/tramp-tests.el | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 9e46d7f538b..02f436141f9 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -2120,16 +2120,19 @@ 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/.") "/method:host:/path")) + (expand-file-name "/method:host:/path/.") + (if (tramp--test-emacs28-p) "/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/") "/method:host:/path")) + (expand-file-name "." "/method:host:/path/") + (if (tramp--test-emacs28-p) "/method:host:/path/" "/method:host:/path"))) (should (string-equal - (expand-file-name "" "/method:host:/path/") "/method:host:/path")) + (expand-file-name "" "/method:host:/path/") + (if (tramp--test-emacs28-p) "/method:host:/path/" "/method:host:/path"))) ;; Quoting local part. (should (string-equal @@ -2145,11 +2148,10 @@ properly. BODY shall not contain a timeout." ;; The following test is inspired by Bug#26911 and Bug#34834. They ;; are rather bugs in `expand-file-name', and it fails for all Emacs -;; versions. Test added for later, when they are fixed. +;; versions prior 28.1. Test added for later, when they are fixed. (ert-deftest tramp-test05-expand-file-name-relative () "Check `expand-file-name'." - ;; Mark as failed until bug has been fixed. - :expected-result :failed + :expected-result (if (>= emacs-major-version 28) :passed :failed) (skip-unless (tramp--test-enabled)) ;; These are the methods the test doesn't fail. @@ -5508,6 +5510,12 @@ Some semantics has been changed for there, w/o new functions or variables, so we check the Emacs version directly." (>= emacs-major-version 27)) +(defun tramp--test-emacs28-p () + "Check for Emacs version >= 28.1. +Some semantics has been changed for there, w/o new functions or +variables, so we check the Emacs version directly." + (>= emacs-major-version 28)) + (defun tramp--test-adb-p () "Check, whether the remote host runs Android. This requires restrictions of file name syntax." -- 2.39.2