aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMichael Albinus2019-06-28 16:32:12 +0200
committerMichael Albinus2019-06-28 16:32:12 +0200
commitaae5bf4438712c9fe761c5e4b5a871192852cd97 (patch)
treeec3db42160422f29bed125227e3d9556bf949337 /test
parentc534a4a3368cb396ccb53677f3153b526724d867 (diff)
downloademacs-aae5bf4438712c9fe761c5e4b5a871192852cd97.tar.gz
emacs-aae5bf4438712c9fe761c5e4b5a871192852cd97.zip
Tramp requires Emacs 24.4
* doc/misc/tramp.texi (Frequently Asked Questions): Use `with-eval-after-load'. in example. * doc/misc/trampver.texi: Set variable emacsver. * lisp/net/tramp.el (tramp-send-string, tramp-call-process) (tramp-call-process-region, tramp-process-lines): * lisp/net/tramp-adb.el (tramp-adb-handle-file-truename) (tramp-adb-sh-fix-ls-output, tramp-adb-maybe-open-connection): * lisp/net/tramp-gvfs.el (tramp-gvfs-get-directory-attributes) (tramp-gvfs-handle-file-notify-add-watch) * lisp/net/tramp-sh.el (tramp-sh-handle-file-truename) (tramp-do-copy-or-rename-file-out-of-band) (tramp-sh-handle-file-notify-add-watch, tramp-find-executable) (tramp-set-remote-path) (tramp-open-connection-setup-interactive-shell) (tramp-maybe-open-connection, tramp-send-command): * lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory) (tramp-smb-handle-file-acl, tramp-smb-handle-process-file) (tramp-smb-handle-set-file-acl) (tramp-smb-handle-start-file-process) (tramp-smb-maybe-open-connection): * lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-set-file-acl): (tramp-sudoedit-send-command): Use `string-join' and `string-empty-p'. * lisp/net/tramp-adb.el: * lisp/net/tramp-archive.el: * lisp/net/tramp-integration.el: * lisp/net/tramp-ftp.el: Use `with-eval-after-load'. * lisp/net/tramp-cmds.el (tramp-cleanup-connection) (tramp-cleanup-all-connections): Cancel timer. * lisp/net/tramp-compat.el (subr-x): Require. (default-toplevel-value): Don't make it a defalias. * lisp/net/tramp-gvfs.el: Use `dbus-event-error-functions'. Do not special handle `split-string'. * lisp/net/tramp.el: Require Emacs 24.4. (tramp-password-prompt-regexp): Use `password-word-equivalents'. (tramp-user-error): Use `user-error'. (tramp-replace-environment-variables): Use `substitute-env-vars'. (tramp-wait-for-regexp): Rearrange `with-current-buffer' call. (tramp-get-local-gid): Use `group-gid'. * lisp/net/trampver.el: Check for Emacs 24.4. * test/lisp/net/tramp-tests.el (tramp-test02-file-name-dissect) (tramp-test02-file-name-dissect-simplified) (tramp-test02-file-name-dissect-separate) (tramp-test03-file-name-host-rules) (tramp-test03-file-name-method-rules): Don't check for `user-error'.
Diffstat (limited to 'test')
-rw-r--r--test/lisp/net/tramp-tests.el15
1 files changed, 0 insertions, 15 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 525f62a3c0b..afe6488ea71 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -19,8 +19,6 @@
19 19
20;;; Commentary: 20;;; Commentary:
21 21
22;; The tests require a recent ert.el from Emacs 24.4.
23
24;; Some of the tests require access to a remote host files. Since 22;; Some of the tests require access to a remote host files. Since
25;; this could be problematic, a mock-up connection method "mock" is 23;; this could be problematic, a mock-up connection method "mock" is
26;; used. Emulating a remote connection, it simply calls "sh -i". 24;; used. Emulating a remote connection, it simply calls "sh -i".
@@ -410,9 +408,6 @@ properly. BODY shall not contain a timeout."
410 408
411(ert-deftest tramp-test02-file-name-dissect () 409(ert-deftest tramp-test02-file-name-dissect ()
412 "Check remote file name components." 410 "Check remote file name components."
413 ;; `user-error' has appeared in Emacs 24.3.
414 (skip-unless (fboundp 'user-error))
415
416 (let ((tramp-default-method "default-method") 411 (let ((tramp-default-method "default-method")
417 (tramp-default-user "default-user") 412 (tramp-default-user "default-user")
418 (tramp-default-host "default-host") 413 (tramp-default-host "default-host")
@@ -863,9 +858,6 @@ properly. BODY shall not contain a timeout."
863(ert-deftest tramp-test02-file-name-dissect-simplified () 858(ert-deftest tramp-test02-file-name-dissect-simplified ()
864 "Check simplified file name components." 859 "Check simplified file name components."
865 :tags '(:expensive-test) 860 :tags '(:expensive-test)
866 ;; `user-error' has appeared in Emacs 24.3.
867 (skip-unless (fboundp 'user-error))
868
869 (let ((tramp-default-method "default-method") 861 (let ((tramp-default-method "default-method")
870 (tramp-default-user "default-user") 862 (tramp-default-user "default-user")
871 (tramp-default-host "default-host") 863 (tramp-default-host "default-host")
@@ -1197,9 +1189,6 @@ properly. BODY shall not contain a timeout."
1197(ert-deftest tramp-test02-file-name-dissect-separate () 1189(ert-deftest tramp-test02-file-name-dissect-separate ()
1198 "Check separate file name components." 1190 "Check separate file name components."
1199 :tags '(:expensive-test) 1191 :tags '(:expensive-test)
1200 ;; `user-error' has appeared in Emacs 24.3.
1201 (skip-unless (fboundp 'user-error))
1202
1203 (let ((tramp-default-method "default-method") 1192 (let ((tramp-default-method "default-method")
1204 (tramp-default-user "default-user") 1193 (tramp-default-user "default-user")
1205 (tramp-default-host "default-host") 1194 (tramp-default-host "default-host")
@@ -1889,8 +1878,6 @@ properly. BODY shall not contain a timeout."
1889 "Check host name rules for host-less methods." 1878 "Check host name rules for host-less methods."
1890 (skip-unless (tramp--test-enabled)) 1879 (skip-unless (tramp--test-enabled))
1891 (skip-unless (tramp--test-sh-p)) 1880 (skip-unless (tramp--test-sh-p))
1892 ;; `user-error' has appeared in Emacs 24.3.
1893 (skip-unless (fboundp 'user-error))
1894 1881
1895 ;; Host names must match rules in case the command template of a 1882 ;; Host names must match rules in case the command template of a
1896 ;; method doesn't use them. 1883 ;; method doesn't use them.
@@ -1914,8 +1901,6 @@ properly. BODY shall not contain a timeout."
1914(ert-deftest tramp-test03-file-name-method-rules () 1901(ert-deftest tramp-test03-file-name-method-rules ()
1915 "Check file name rules for some methods." 1902 "Check file name rules for some methods."
1916 (skip-unless (tramp--test-enabled)) 1903 (skip-unless (tramp--test-enabled))
1917 ;; `user-error' has appeared in Emacs 24.3.
1918 (skip-unless (fboundp 'user-error))
1919 1904
1920 ;; Multi hops are allowed for inline methods only. 1905 ;; Multi hops are allowed for inline methods only.
1921 (should-error 1906 (should-error