]> git.eshelyaron.com Git - emacs.git/commitdiff
Port tramp-tests to new copy-directory behavior
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Sep 2017 06:04:10 +0000 (23:04 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Sep 2017 06:05:20 +0000 (23:05 -0700)
* 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

index 735211c3da6c8d7f8e63465c7be7697fab8678f7..4139d50ff01fe59d48f73cb11f1705f073cfbe12 100644 (file)
@@ -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))