Skip to content

Commit fa6a096

Browse files
committed
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.
1 parent f836ed0 commit fa6a096

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

test/lisp/net/tramp-tests.el

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
(defvar tramp-connection-properties)
6969
(defvar tramp-copy-size-limit)
7070
(defvar tramp-display-escape-sequence-regexp)
71+
(defvar tramp-fuse-remove-hidden-files)
7172
(defvar tramp-fuse-unmount-on-cleanup)
7273
(defvar tramp-inline-compress-start-size)
7374
(defvar tramp-persistency-file-name)
@@ -2997,7 +2998,8 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
29972998
(skip-unless (tramp--test-enabled))
29982999

29993000
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
3000-
(let* ((tmp-name1 (tramp--test-make-temp-name nil quoted))
3001+
(let* ((tramp-fuse-remove-hidden-files t)
3002+
(tmp-name1 (tramp--test-make-temp-name nil quoted))
30013003
(tmp-name2 (expand-file-name "bla" tmp-name1))
30023004
(tmp-name3 (expand-file-name "foo" tmp-name1)))
30033005
(unwind-protect
@@ -3041,7 +3043,8 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
30413043
(skip-unless (tramp--test-enabled))
30423044

30433045
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
3044-
(let* ((tmp-name1 (tramp--test-make-temp-name nil quoted))
3046+
(let* ((tramp-fuse-remove-hidden-files t)
3047+
(tmp-name1 (tramp--test-make-temp-name nil quoted))
30453048
(tmp-name2 (expand-file-name "foo" tmp-name1))
30463049
(tmp-name3 (expand-file-name "bar" tmp-name1))
30473050
(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'."
43034306
;; Method and host name in completion mode. This kind of completion
43044307
;; does not work on MS Windows.
43054308
(when (not (memq system-type '(cygwin windows-nt)))
4306-
(let ((method (file-remote-p tramp-test-temporary-file-directory 'method))
4309+
(let ((tramp-fuse-remove-hidden-files t)
4310+
(method (file-remote-p tramp-test-temporary-file-directory 'method))
43074311
(host (file-remote-p tramp-test-temporary-file-directory 'host))
43084312
(orig-syntax tramp-syntax))
43094313
(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'."
43554359

43564360
(dolist (non-essential '(nil t))
43574361
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
4358-
(let ((tmp-name (tramp--test-make-temp-name nil quoted)))
4362+
(let ((tramp-fuse-remove-hidden-files t)
4363+
(tmp-name (tramp--test-make-temp-name nil quoted)))
43594364

43604365
(unwind-protect
43614366
(progn
@@ -6463,6 +6468,7 @@ This requires restrictions of file name syntax."
64636468
;; would let the test fail.
64646469
(let* ((tramp-test-temporary-file-directory
64656470
(file-truename tramp-test-temporary-file-directory))
6471+
(tramp-fuse-remove-hidden-files t)
64666472
(tmp-name1 (tramp--test-make-temp-name nil quoted))
64676473
(tmp-name2 (tramp--test-make-temp-name 'local quoted))
64686474
(files
@@ -6636,7 +6642,7 @@ This requires restrictions of file name syntax."
66366642

66376643
(delete-file file2)
66386644
(should-not (file-exists-p file2))
6639-
(delete-directory file1)
6645+
(delete-directory file1 'recursive)
66406646
(should-not (file-exists-p file1))))
66416647

66426648
;; Check, that environment variables are set correctly.

0 commit comments

Comments
 (0)