summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2016-12-12 11:12:34 +0100
committerMichael Albinus <michael.albinus@gmx.de>2016-12-12 11:12:34 +0100
commit00d4ba2794243763b818c013669e36c1d2c7de62 (patch)
tree386fdd4c8234008b83a485e63560a45ab20625bb /test
parent184ed36136d7d78a914979009db208518312137c (diff)
downloademacs-00d4ba2794243763b818c013669e36c1d2c7de62.tar.gz
Further improvements in Tramp's file name unquoting
* lisp/net/tramp-adb.el (tramp-adb-handle-file-local-copy) (tramp-adb-handle-write-region): Unquote localname. (tramp-adb-handle-copy-file): Implement direct copy on remote device. (tramp-adb-handle-rename-file): Quote arguments, add "-f" to force. * lisp/net/tramp.el (tramp-file-name-unquote-localname): New defun. (tramp-handle-file-name-case-insensitive-p): * lisp/net/tramp-gvfs.el (tramp-gvfs-get-file-attributes) (tramp-gvfs-connection-mounted-p, tramp-gvfs-mount-spec) (tramp-gvfs-maybe-open-connection): * lisp/net/tramp-sh.el (tramp-make-copy-program-file-name): * lisp/net/tramp-smb.el (tramp-smb-get-share) (tramp-smb-get-localname): Use it. * test/lisp/net/tramp-tests.el (tramp--test-docker-p): New defun. (tramp--test-special-characters, tramp-test34-utf8) (tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl) (tramp-test34-utf8-with-ls): Use it.
Diffstat (limited to 'test')
-rw-r--r--test/lisp/net/tramp-tests.el14
1 files changed, 13 insertions, 1 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 2d17fa08ca5..e80af422244 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2102,6 +2102,12 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
This requires restrictions of file name syntax."
(tramp-adb-file-name-p tramp-test-temporary-file-directory))
+(defun tramp--test-docker-p ()
+ "Check, whether the docker method is used.
+This does not support some special file names."
+ (string-equal
+ "docker" (file-remote-p tramp-test-temporary-file-directory 'method)))
+
(defun tramp--test-ftp-p ()
"Check, whether an FTP-like method is used.
This does not support globbing characters in file names (yet)."
@@ -2293,7 +2299,9 @@ Several special characters do not work properly there."
(tramp--test-check-files
(if (or (tramp--test-gvfs-p) (tramp--test-smb-or-windows-nt-p))
"foo bar baz"
- (if (or (tramp--test-adb-p) (eq system-type 'cygwin))
+ (if (or (tramp--test-adb-p)
+ (tramp--test-docker-p)
+ (eq system-type 'cygwin))
" foo bar baz "
" foo\tbar baz\t"))
"$foo$bar$$baz$"
@@ -2404,6 +2412,7 @@ Use the `ls' command."
(ert-deftest tramp-test34-utf8 ()
"Check UTF8 encoding in file names and file contents."
(skip-unless (tramp--test-enabled))
+ (skip-unless (not (tramp--test-docker-p)))
(skip-unless (not (tramp--test-rsync-p)))
(tramp--test-utf8))
@@ -2413,6 +2422,7 @@ Use the `ls' command."
Use the `stat' command."
:tags '(:expensive-test)
(skip-unless (tramp--test-enabled))
+ (skip-unless (not (tramp--test-docker-p)))
(skip-unless (and (tramp--test-sh-p) (not (tramp--test-rsync-p))))
(with-parsed-tramp-file-name tramp-test-temporary-file-directory nil
(skip-unless (tramp-get-remote-stat v)))
@@ -2429,6 +2439,7 @@ Use the `stat' command."
Use the `perl' command."
:tags '(:expensive-test)
(skip-unless (tramp--test-enabled))
+ (skip-unless (not (tramp--test-docker-p)))
(skip-unless (and (tramp--test-sh-p) (not (tramp--test-rsync-p))))
(with-parsed-tramp-file-name tramp-test-temporary-file-directory nil
(skip-unless (tramp-get-remote-perl v)))
@@ -2448,6 +2459,7 @@ Use the `perl' command."
Use the `ls' command."
:tags '(:expensive-test)
(skip-unless (tramp--test-enabled))
+ (skip-unless (not (tramp--test-docker-p)))
(skip-unless (and (tramp--test-sh-p) (not (tramp--test-rsync-p))))
(let ((tramp-connection-properties