aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMichael Albinus2019-11-06 16:49:35 +0100
committerMichael Albinus2019-11-06 16:49:35 +0100
commitda2df1c1b5b5a7373f361875b43dd003a221e2e0 (patch)
tree10be03ac989db4fc075422d9648b5f816b3bc898 /test
parentd30f5e7eeecd5425e236542189a1d683c00e7ed7 (diff)
downloademacs-da2df1c1b5b5a7373f361875b43dd003a221e2e0.tar.gz
emacs-da2df1c1b5b5a7373f361875b43dd003a221e2e0.zip
More error checks in Tramp's make-directory
* lisp/net/tramp-adb.el (tramp-adb-handle-make-directory): * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-make-directory): * lisp/net/tramp-sh.el (tramp-sh-handle-make-directory): * lisp/net/tramp-smb.el (tramp-smb-handle-make-directory): * lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-make-directory): Signal `file-already-exists' if DIR exists. * test/lisp/net/tramp-tests.el (tramp-test04-substitute-in-file-name): Fix thinko. (tramp-test13-make-directory, tramp-test14-delete-directory) (tramp-test15-copy-directory): Extend tests.
Diffstat (limited to 'test')
-rw-r--r--test/lisp/net/tramp-tests.el23
1 files changed, 17 insertions, 6 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index ec9cda0bbdd..9b73f7ca28e 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -1958,7 +1958,7 @@ properly. BODY shall not contain a timeout."
1958 1958
1959 ;; Forwhatever reasons, the following tests let Emacs crash for 1959 ;; Forwhatever reasons, the following tests let Emacs crash for
1960 ;; Emacs 24 and Emacs 25, occasionally. No idea what's up. 1960 ;; Emacs 24 and Emacs 25, occasionally. No idea what's up.
1961 (when (or (tramp--test-emacs26-p) (tramp--test-emacs27-p)) 1961 (when (tramp--test-emacs26-p)
1962 (should 1962 (should
1963 (string-equal (substitute-in-file-name "/method:host://~foo") "/~foo")) 1963 (string-equal (substitute-in-file-name "/method:host://~foo") "/~foo"))
1964 (should 1964 (should
@@ -2593,9 +2593,14 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
2593 (unwind-protect 2593 (unwind-protect
2594 (progn 2594 (progn
2595 (make-directory tmp-name1) 2595 (make-directory tmp-name1)
2596 (should-error
2597 (make-directory tmp-name1)
2598 :type 'file-already-exists)
2596 (should (file-directory-p tmp-name1)) 2599 (should (file-directory-p tmp-name1))
2597 (should (file-accessible-directory-p tmp-name1)) 2600 (should (file-accessible-directory-p tmp-name1))
2598 (should-error (make-directory tmp-name2) :type 'file-error) 2601 (should-error
2602 (make-directory tmp-name2)
2603 :type 'file-error)
2599 (make-directory tmp-name2 'parents) 2604 (make-directory tmp-name2 'parents)
2600 (should (file-directory-p tmp-name2)) 2605 (should (file-directory-p tmp-name2))
2601 (should (file-accessible-directory-p tmp-name2)) 2606 (should (file-accessible-directory-p tmp-name2))
@@ -2627,7 +2632,9 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
2627 (should (file-directory-p tmp-name2)) 2632 (should (file-directory-p tmp-name2))
2628 (write-region "foo" nil (expand-file-name "bla" tmp-name2)) 2633 (write-region "foo" nil (expand-file-name "bla" tmp-name2))
2629 (should (file-exists-p (expand-file-name "bla" tmp-name2))) 2634 (should (file-exists-p (expand-file-name "bla" tmp-name2)))
2630 (should-error (delete-directory tmp-name1) :type 'file-error) 2635 (should-error
2636 (delete-directory tmp-name1)
2637 :type 'file-error)
2631 (delete-directory tmp-name1 'recursive) 2638 (delete-directory tmp-name1 'recursive)
2632 (should-not (file-directory-p tmp-name1))))) 2639 (should-not (file-directory-p tmp-name1)))))
2633 2640
@@ -2663,7 +2670,7 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
2663 (when (tramp--test-emacs26-p) 2670 (when (tramp--test-emacs26-p)
2664 (should-error 2671 (should-error
2665 (copy-directory tmp-name1 tmp-name2) 2672 (copy-directory tmp-name1 tmp-name2)
2666 :type 'file-error)) 2673 :type 'file-already-exists))
2667 (copy-directory tmp-name1 (file-name-as-directory tmp-name2)) 2674 (copy-directory tmp-name1 (file-name-as-directory tmp-name2))
2668 (should (file-directory-p tmp-name3)) 2675 (should (file-directory-p tmp-name3))
2669 (should (file-exists-p tmp-name6))) 2676 (should (file-exists-p tmp-name6)))
@@ -3523,7 +3530,9 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
3523 :type 'file-error) 3530 :type 'file-error)
3524 (make-symbolic-link tmp-name1 tmp-name2) 3531 (make-symbolic-link tmp-name1 tmp-name2)
3525 (should (file-symlink-p tmp-name2)) 3532 (should (file-symlink-p tmp-name2))
3526 (should-error (file-truename tmp-name1) :type 'file-error)))) 3533 (should-error
3534 (file-truename tmp-name1)
3535 :type 'file-error))))
3527 3536
3528 ;; Cleanup. 3537 ;; Cleanup.
3529 (ignore-errors 3538 (ignore-errors
@@ -4276,7 +4285,9 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
4276 (while (accept-process-output proc nil nil 0))) 4285 (while (accept-process-output proc nil nil 0)))
4277 (should-not (process-live-p proc)) 4286 (should-not (process-live-p proc))
4278 ;; An interrupted process cannot be interrupted, again. 4287 ;; An interrupted process cannot be interrupted, again.
4279 (should-error (interrupt-process proc) :type 'error)) 4288 (should-error
4289 (interrupt-process proc)
4290 :type 'error))
4280 4291
4281 ;; Cleanup. 4292 ;; Cleanup.
4282 (ignore-errors (delete-process proc))))) 4293 (ignore-errors (delete-process proc)))))