* lisp/net/tramp-sh.el (tramp-convert-file-attributes):

Revert patch from 2015-08-24.  Tramp shall be have like for local files.

* test/automated/tramp-tests.el (tramp-test18-file-attributes):
Adapt test.

1 files changed, 4 insertions, 3 deletions

diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el
index 498a0cfa7da..c5cab7d5991 100644
--- a/test/automated/tramp-tests.el
+++ b/test/automated/tramp-tests.el
@@ -1118,9 +1118,10 @@ This tests also `file-readable-p' and `file-regular-p'."
                t)))
           (when (file-symlink-p tmp-name2)
             (setq attr (file-attributes tmp-name2))
-            (should (string-equal
-                     (car attr)
-                     (file-remote-p (file-truename tmp-name3) 'localname)))
+            (should
+             (string-equal
+              (car attr)
+              (tramp-file-name-localname (tramp-dissect-file-name tmp-name3))))
             (delete-file tmp-name2))
 
           (delete-file tmp-name1)