summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2017-10-23 12:46:32 +0200
committerMichael Albinus <michael.albinus@gmx.de>2017-10-23 12:46:32 +0200
commit8093e82e429d598d72ae7e51d4a2d5a49d98902e (patch)
tree0c76e8d4787907801e66c26c8dc4800c35dd7166 /test
parent46cdc01daae6972aaa53e6db16a52fdc2a4b7cac (diff)
downloademacs-8093e82e429d598d72ae7e51d4a2d5a49d98902e.tar.gz
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.
Diffstat (limited to 'test')
-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'."
(defun tramp--test-emacs26-p ()
"Check for Emacs version >= 26.1.
Some semantics has been changed for there, w/o new functions or
-variables, so we check function Emacs version directly."
+variables, so we check the Emacs version directly."
(>= emacs-major-version 26))
(defun tramp--test-adb-p ()
@@ -4338,6 +4338,9 @@ process sentinels. They shall not disturb each other."
Since it unloads Tramp, it shall be the last test to run."
:tags '(:expensive-test)
(skip-unless noninteractive)
+ ;; The autoloaded Tramp objects are different since Emacs 26.1. We
+ ;; cannot test older Emacsen, therefore.
+ (skip-unless (tramp--test-emacs26-p))
(when (featurep 'tramp)
(unload-feature 'tramp 'force)