summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-09-10 23:04:10 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2017-09-10 23:05:20 -0700
commit29963648dd11d53088f753e4f9b0491a7b981c0f (patch)
tree0de4ba5efe606c4adeea26aefbc7f194ccce27de
parent2aa028825920207cca2bacb581111ab780e5d9ee (diff)
downloademacs-29963648dd11d53088f753e4f9b0491a7b981c0f.tar.gz
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.
-rw-r--r--test/lisp/net/tramp-tests.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 735211c3da6..4139d50ff01 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))