From fa6a0962c5315cceb3632fa6a701eac986940810 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 17 May 2022 09:14:36 +0200 Subject: [PATCH] Fix Tramp sshfs tests (don't merge) * test/lisp/net/tramp-tests.el (tramp-fuse-remove-hidden-files): Declare. (tramp-test16-directory-files) (tramp-test16-file-expand-wildcards) (tramp-test26-file-name-completion, tramp--test-check-files): Use it. (tramp--test-check-files): Delete directory recursively. --- test/lisp/net/tramp-tests.el | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 7a377e7fbf1..dbf62dbc1cf 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -68,6 +68,7 @@ (defvar tramp-connection-properties) (defvar tramp-copy-size-limit) (defvar tramp-display-escape-sequence-regexp) +(defvar tramp-fuse-remove-hidden-files) (defvar tramp-fuse-unmount-on-cleanup) (defvar tramp-inline-compress-start-size) (defvar tramp-persistency-file-name) @@ -2997,7 +2998,8 @@ This tests also `file-directory-p' and `file-accessible-directory-p'." (skip-unless (tramp--test-enabled)) (dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil))) - (let* ((tmp-name1 (tramp--test-make-temp-name nil quoted)) + (let* ((tramp-fuse-remove-hidden-files t) + (tmp-name1 (tramp--test-make-temp-name nil quoted)) (tmp-name2 (expand-file-name "bla" tmp-name1)) (tmp-name3 (expand-file-name "foo" tmp-name1))) (unwind-protect @@ -3041,7 +3043,8 @@ This tests also `file-directory-p' and `file-accessible-directory-p'." (skip-unless (tramp--test-enabled)) (dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil))) - (let* ((tmp-name1 (tramp--test-make-temp-name nil quoted)) + (let* ((tramp-fuse-remove-hidden-files t) + (tmp-name1 (tramp--test-make-temp-name nil quoted)) (tmp-name2 (expand-file-name "foo" tmp-name1)) (tmp-name3 (expand-file-name "bar" tmp-name1)) (tmp-name4 (expand-file-name "baz" tmp-name1)) @@ -4303,7 +4306,8 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." ;; Method and host name in completion mode. This kind of completion ;; does not work on MS Windows. (when (not (memq system-type '(cygwin windows-nt))) - (let ((method (file-remote-p tramp-test-temporary-file-directory 'method)) + (let ((tramp-fuse-remove-hidden-files t) + (method (file-remote-p tramp-test-temporary-file-directory 'method)) (host (file-remote-p tramp-test-temporary-file-directory 'host)) (orig-syntax tramp-syntax)) (when (and (stringp host) (string-match tramp-host-with-port-regexp host)) @@ -4355,7 +4359,8 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (dolist (non-essential '(nil t)) (dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil))) - (let ((tmp-name (tramp--test-make-temp-name nil quoted))) + (let ((tramp-fuse-remove-hidden-files t) + (tmp-name (tramp--test-make-temp-name nil quoted))) (unwind-protect (progn @@ -6463,6 +6468,7 @@ This requires restrictions of file name syntax." ;; would let the test fail. (let* ((tramp-test-temporary-file-directory (file-truename tramp-test-temporary-file-directory)) + (tramp-fuse-remove-hidden-files t) (tmp-name1 (tramp--test-make-temp-name nil quoted)) (tmp-name2 (tramp--test-make-temp-name 'local quoted)) (files @@ -6636,7 +6642,7 @@ This requires restrictions of file name syntax." (delete-file file2) (should-not (file-exists-p file2)) - (delete-directory file1) + (delete-directory file1 'recursive) (should-not (file-exists-p file1)))) ;; Check, that environment variables are set correctly. -- 2.39.2