aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMichael Albinus2017-05-28 23:44:10 +0200
committerMichael Albinus2017-05-28 23:44:10 +0200
commite7bb7cc29bc27b368a066c088943c93b1c689b23 (patch)
tree228e28975ce1c0202be9a0f160d5f827e87f5ce5 /test
parent288b3ca2e519903653b9bc88d281ecd9f6b162a4 (diff)
downloademacs-e7bb7cc29bc27b368a066c088943c93b1c689b23.tar.gz
emacs-e7bb7cc29bc27b368a066c088943c93b1c689b23.zip
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.el4
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."
1510(ert-deftest tramp-test03-file-name-defaults () 1510(ert-deftest tramp-test03-file-name-defaults ()
1511 "Check default values for some methods." 1511 "Check default values for some methods."
1512 ;; Default values in tramp-adb.el. 1512 ;; Default values in tramp-adb.el.
1513 (should (string-equal (file-remote-p "/adb::" 'host) nil)) 1513 (should (string-equal (file-remote-p "/adb::" 'host) ""))
1514 ;; Default values in tramp-ftp.el. 1514 ;; Default values in tramp-ftp.el.
1515 (should (string-equal (file-remote-p "/-:ftp.host:" 'method) "ftp")) 1515 (should (string-equal (file-remote-p "/-:ftp.host:" 'method) "ftp"))
1516 (dolist (u '("ftp" "anonymous")) 1516 (dolist (u '("ftp" "anonymous"))
@@ -1626,7 +1626,7 @@ handled properly. BODY shall not contain a timeout."
1626 :expected-result :failed 1626 :expected-result :failed
1627 (skip-unless (tramp--test-enabled)) 1627 (skip-unless (tramp--test-enabled))
1628 ;; File names with a share behave differently. 1628 ;; File names with a share behave differently.
1629 (when (tramp--test-afp-or-smb-p) 1629 (when (or (tramp--test-adb-p) (tramp--test-afp-or-smb-p))
1630 (setf (ert-test-expected-result-type 1630 (setf (ert-test-expected-result-type
1631 (ert-get-test 'tramp-test05-expand-file-name-relative)) 1631 (ert-get-test 'tramp-test05-expand-file-name-relative))
1632 :passed)) 1632 :passed))