diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2017-05-28 23:44:10 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2017-05-28 23:44:10 +0200 |
| commit | e7bb7cc29bc27b368a066c088943c93b1c689b23 (patch) | |
| tree | 228e28975ce1c0202be9a0f160d5f827e87f5ce5 /test | |
| parent | 288b3ca2e519903653b9bc88d281ecd9f6b162a4 (diff) | |
| download | emacs-e7bb7cc29bc27b368a066c088943c93b1c689b23.tar.gz | |
Some tweaks, almost all for Tramp adb method
* lisp/net/tramp-adb.el (tramp-adb-parse-device-names):
Use `make-tramp-file-name'.
(tramp-adb-get-device): Use `tramp-file-name-port-or-default'.
(tramp-adb-maybe-open-connection): Set "prompt" property.
(tramp-adb-wait-for-output): Use it.
* lisp/net/tramp-cache.el (tramp-cache-print): Use `elt'.
(tramp-dump-connection-properties): Check also that there are
properties to be saved. Don't save "started" property of
"ftp" method.
* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-expand-file-name):
Use `make-tramp-file-name'.
* lisp/net/tramp.el (tramp-remote-file-name-spec-regexp):
Host could be empty.
(tramp-file-name-port-or-default): New defun.
(tramp-dissect-file-name): Simplify `make-tramp-file-name' call.
(tramp-handle-file-name-case-insensitive-p): Use a progress reporter.
(tramp-call-process, tramp-call-process-region):
Use `make-tramp-file-name'.
* test/lisp/net/tramp-tests.el (tramp-test03-file-name-defaults):
Revert change from 2017-05-24.
(tramp-test05-expand-file-name-relative): Let it also pass for
"adb" method.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 7a12aae1bf2..8c97fafa3e6 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -1510,7 +1510,7 @@ handled properly. BODY shall not contain a timeout." (ert-deftest tramp-test03-file-name-defaults () "Check default values for some methods." ;; Default values in tramp-adb.el. - (should (string-equal (file-remote-p "/adb::" 'host) nil)) + (should (string-equal (file-remote-p "/adb::" 'host) "")) ;; Default values in tramp-ftp.el. (should (string-equal (file-remote-p "/-:ftp.host:" 'method) "ftp")) (dolist (u '("ftp" "anonymous")) @@ -1626,7 +1626,7 @@ handled properly. BODY shall not contain a timeout." :expected-result :failed (skip-unless (tramp--test-enabled)) ;; File names with a share behave differently. - (when (tramp--test-afp-or-smb-p) + (when (or (tramp--test-adb-p) (tramp--test-afp-or-smb-p)) (setf (ert-test-expected-result-type (ert-get-test 'tramp-test05-expand-file-name-relative)) :passed)) |