diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2022-08-09 18:12:27 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2022-08-09 18:12:27 +0200 |
| commit | b0653b27e25bfad2416364c33e1a5994285435c4 (patch) | |
| tree | 26f13719c18622f29344038477b55b9e12110c29 /test | |
| parent | e5bf2b942fec6e901c165aff93c89e4dd8e448dd (diff) | |
| download | emacs-b0653b27e25bfad2416364c33e1a5994285435c4.tar.gz emacs-b0653b27e25bfad2416364c33e1a5994285435c4.tar.bz2 emacs-b0653b27e25bfad2416364c33e1a5994285435c4.zip | |
Further Tramp fixes for Android 12
* lisp/net/tramp-adb.el (tramp-adb-handle-file-attributes)
(tramp-adb-handle-directory-files-and-attributes)
(tramp-adb-handle-file-name-all-completions): Pipe "ls" output
through "cat", in order to avoid quoting special characters.
(tramp-adb-sh-fix-ls-output): Remove fix for file names with spaces.
* test/lisp/net/tramp-tests.el (tramp-test22-file-times): Adapt test.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index a3e80e89562..ad81d0c09ea 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -4160,7 +4160,8 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (file-attributes tmp-name1)))) ;; Skip the test, if the remote handler is not able to set ;; the correct time. - (skip-unless (set-file-times tmp-name1 (seconds-to-time 1))) + ;; Some remote machines cannot resolve seconds. So we use a minute. + (skip-unless (set-file-times tmp-name1 (seconds-to-time 60))) ;; Dumb remote shells without perl(1) or stat(1) are not ;; able to return the date correctly. They say "don't know". (unless (tramp-compat-time-equal-p @@ -4168,16 +4169,9 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (file-attributes tmp-name1)) tramp-time-dont-know) (should - (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)))) + (tramp-compat-time-equal-p + (file-attribute-modification-time (file-attributes tmp-name1)) + (seconds-to-time 60))) ;; Setting the time for not existing files shall fail. (should-error (set-file-times tmp-name2) @@ -4192,18 +4186,12 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." ;; regular files, there shouldn't be a difference. (when (tramp--test-emacs28-p) (with-no-warnings - (set-file-times tmp-name1 (seconds-to-time 1) 'nofollow) + (set-file-times tmp-name1 (seconds-to-time 60) 'nofollow) (should - (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)))))))) + (tramp-compat-time-equal-p + (file-attribute-modification-time + (file-attributes tmp-name1)) + (seconds-to-time 60))))))) ;; Cleanup. (ignore-errors |