From 5b5774e5d5f845de8493ade93f5eed66934d779c Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Fri, 28 Feb 2014 09:47:43 +0100 Subject: [PATCH] * automated/tramp-tests.el (tramp--test-enabled) (tramp-test15-copy-directory): No special handling of tramp-adb.el anymore. It's fixed in that package. --- test/ChangeLog | 6 ++++++ test/automated/tramp-tests.el | 12 +++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/ChangeLog b/test/ChangeLog index 0910f0b15b8..9082f2ace2a 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2014-02-28 Michael Albinus + + * automated/tramp-tests.el (tramp--test-enabled) + (tramp-test15-copy-directory): No special handling of tramp-adb.el + anymore. It's fixed in that package. + 2014-02-27 Michael Albinus * automated/tramp-tests.el (tramp--test-enabled): Move connection diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index 706e2e0e25e..25cd0c6a96d 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -82,10 +82,7 @@ being the result.") (file-directory-p tramp-test-temporary-file-directory) (file-writable-p tramp-test-temporary-file-directory)))))) - (when (and (cdr tramp--test-enabled-checked) - (not (eq (tramp-find-foreign-file-name-handler - tramp-test-temporary-file-directory) - 'tramp-adb-file-name-handler))) + (when (cdr tramp--test-enabled-checked) ;; Cleanup connection. We don't cleanup for adb, because it ;; doesn't behave well when is disconnect several times. (tramp-cleanup-connection @@ -751,14 +748,11 @@ This tests also `file-directory-p' and `file-accessible-directory-p'." (write-region "foo" nil tmp-name4) (should (file-directory-p tmp-name1)) (should (file-exists-p tmp-name4)) - ;; We do not care, whether file permissions and time stamps - ;; are correct. Sometimes, it is not possible to manage - ;; them, for example in tramp-adb.el. - (ignore-errors (copy-directory tmp-name1 tmp-name2)) + (copy-directory tmp-name1 tmp-name2) (should (file-directory-p tmp-name2)) (should (file-exists-p tmp-name5)) ;; Target directory does exist already. - (ignore-errors (copy-directory tmp-name1 tmp-name2)) + (copy-directory tmp-name1 tmp-name2) (should (file-directory-p tmp-name3)) (should (file-exists-p tmp-name6))) (ignore-errors -- 2.39.2