aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2017-10-23 12:46:32 +0200
committerMichael Albinus2017-10-23 12:46:32 +0200
commit8093e82e429d598d72ae7e51d4a2d5a49d98902e (patch)
tree0c76e8d4787907801e66c26c8dc4800c35dd7166
parent46cdc01daae6972aaa53e6db16a52fdc2a4b7cac (diff)
downloademacs-8093e82e429d598d72ae7e51d4a2d5a49d98902e.tar.gz
emacs-8093e82e429d598d72ae7e51d4a2d5a49d98902e.zip
Improve backward compatibility of tramp-tests.el
* test/lisp/net/tramp-tests.el (tramp--test-emacs26-p): Fix docstring. (tramp-test41-unload): Skip unless Emacs >= 26.
-rw-r--r--test/lisp/net/tramp-tests.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index e92d1b6203c..fdd816dae2e 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -3678,7 +3678,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
3678(defun tramp--test-emacs26-p () 3678(defun tramp--test-emacs26-p ()
3679 "Check for Emacs version >= 26.1. 3679 "Check for Emacs version >= 26.1.
3680Some semantics has been changed for there, w/o new functions or 3680Some semantics has been changed for there, w/o new functions or
3681variables, so we check function Emacs version directly." 3681variables, so we check the Emacs version directly."
3682 (>= emacs-major-version 26)) 3682 (>= emacs-major-version 26))
3683 3683
3684(defun tramp--test-adb-p () 3684(defun tramp--test-adb-p ()
@@ -4338,6 +4338,9 @@ process sentinels. They shall not disturb each other."
4338Since it unloads Tramp, it shall be the last test to run." 4338Since it unloads Tramp, it shall be the last test to run."
4339 :tags '(:expensive-test) 4339 :tags '(:expensive-test)
4340 (skip-unless noninteractive) 4340 (skip-unless noninteractive)
4341 ;; The autoloaded Tramp objects are different since Emacs 26.1. We
4342 ;; cannot test older Emacsen, therefore.
4343 (skip-unless (tramp--test-emacs26-p))
4341 4344
4342 (when (featurep 'tramp) 4345 (when (featurep 'tramp)
4343 (unload-feature 'tramp 'force) 4346 (unload-feature 'tramp 'force)