emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 2996364: Port tramp-tests to new copy-directory beh


From: Paul Eggert
Subject: [Emacs-diffs] master 2996364: Port tramp-tests to new copy-directory behavior
Date: Mon, 11 Sep 2017 02:05:26 -0400 (EDT)

branch: master
commit 29963648dd11d53088f753e4f9b0491a7b981c0f
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Port tramp-tests to new copy-directory behavior
    
    * test/lisp/net/tramp-tests.el (tramp-test15-copy-directory):
    Use directory name as arg for copy-directory when we want
    the special behavior.
---
 test/lisp/net/tramp-tests.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 735211c..4139d50 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2117,7 +2117,7 @@ This tests also `file-directory-p' and 
`file-accessible-directory-p'."
            (should (file-directory-p tmp-name2))
            (should (file-exists-p tmp-name5))
            ;; Target directory does exist already.
-           (copy-directory tmp-name1 tmp-name2)
+           (copy-directory tmp-name1 (file-name-as-directory tmp-name2))
            (should (file-directory-p tmp-name3))
            (should (file-exists-p tmp-name6)))
 
@@ -2140,7 +2140,8 @@ This tests also `file-directory-p' and 
`file-accessible-directory-p'."
            ;; Target directory does exist already.
            (delete-file tmp-name5)
            (should-not (file-exists-p tmp-name5))
-           (copy-directory tmp-name1 tmp-name2 nil 'parents 'contents)
+           (copy-directory tmp-name1 (file-name-as-directory tmp-name2)
+                           nil 'parents 'contents)
            (should (file-directory-p tmp-name2))
            (should (file-exists-p tmp-name5))
            (should-not (file-directory-p tmp-name3))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]