diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2022-08-06 18:09:35 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2022-08-06 18:09:35 +0200 |
| commit | b9c65203d0f419306ac062e59a59643db9a1a541 (patch) | |
| tree | 623c0acb010e98543d68b9563a4acc0126418081 /test | |
| parent | a2127251a5c66f3b7d47fd13893e2e628a8d2105 (diff) | |
| download | emacs-b9c65203d0f419306ac062e59a59643db9a1a541.tar.gz emacs-b9c65203d0f419306ac062e59a59643db9a1a541.tar.bz2 emacs-b9c65203d0f419306ac062e59a59643db9a1a541.zip | |
Adapt Tramp for Android 12
* lisp/net/tramp-adb.el (tramp-methods): Use "%d".
(tramp-adb-handle-directory-files-and-attributes): Fix "." and
".." in listing.
(tramp-adb-sh-fix-ls-output): Fix file names with spaces.
(tramp-adb-maybe-open-connection): Compute args from `tramp-login-args'.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-handle-make-process): Check for adb device if indicated.
* test/lisp/net/tramp-tests.el (tramp-test17-insert-directory)
(tramp-test22-file-times): Adapt tests.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 56 |
1 files changed, 35 insertions, 21 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index e2d4ed781bb..e2cafc240b9 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -3232,20 +3232,21 @@ This tests also `file-directory-p' and `file-accessible-directory-p'." (goto-char (point-min)) (should (looking-at-p (format "^.+ %s/$" (regexp-quote tmp-name1))))) - (with-temp-buffer - (insert-directory - (file-name-as-directory tmp-name1) "-al" nil 'full-directory-p) - (goto-char (point-min)) - (should - (looking-at-p - (concat - ;; There might be a summary line. - "\\(total.+[[:digit:]]+ ?[kKMGTPEZY]?i?B?\n\\)?" - ;; We don't know in which order ".", ".." and "foo" appear. - (format - "\\(.+ %s\\( ->.+\\)?\n\\)\\{%d\\}" - (regexp-opt (directory-files tmp-name1)) - (length (directory-files tmp-name1))))))) + (let ((directory-files (directory-files tmp-name1))) + (with-temp-buffer + (insert-directory + (file-name-as-directory tmp-name1) "-al" nil 'full-directory-p) + (goto-char (point-min)) + (should + (looking-at-p + (concat + ;; There might be a summary line. + "\\(total.+[[:digit:]]+ ?[kKMGTPEZY]?i?B?\n\\)?" + ;; We don't know in which order ".", ".." and "foo" appear. + (format + "\\(.+ %s\\( ->.+\\)?\n\\)\\{%d\\}" + (regexp-opt directory-files) + (length directory-files))))))) ;; Check error cases. (when (and (tramp--test-supports-set-file-modes-p) @@ -4167,9 +4168,16 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (file-attributes tmp-name1)) tramp-time-dont-know) (should - (tramp-compat-time-equal-p - (file-attribute-modification-time (file-attributes tmp-name1)) - (seconds-to-time 1))) + (or (tramp-compat-time-equal-p + (file-attribute-modification-time + (file-attributes tmp-name1)) + (seconds-to-time 1)) + ;; Some remote machines cannot resolve seconds. + ;; The return the modification time `(0 0). + (tramp-compat-time-equal-p + (file-attribute-modification-time + (file-attributes tmp-name1)) + (seconds-to-time 0)))) ;; Setting the time for not existing files shall fail. (should-error (set-file-times tmp-name2) @@ -4186,10 +4194,16 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (with-no-warnings (set-file-times tmp-name1 (seconds-to-time 1) 'nofollow) (should - (tramp-compat-time-equal-p - (file-attribute-modification-time - (file-attributes tmp-name1)) - (seconds-to-time 1))))))) + (or (tramp-compat-time-equal-p + (file-attribute-modification-time + (file-attributes tmp-name1)) + (seconds-to-time 1)) + ;; Some remote machines cannot resolve seconds. + ;; The return the modification time `(0 0). + (tramp-compat-time-equal-p + (file-attribute-modification-time + (file-attributes tmp-name1)) + (seconds-to-time 0)))))))) ;; Cleanup. (ignore-errors |