From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 20 Apr 2014 21:39:43 +0000 (+0200)
Subject: * automated/tramp-tests.el (tramp-test19-directory-files-and-attributes)
X-Git-Tag: emacs-24.3.91~118
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f3a4812cf2fe0facbda57bee0810cf23f1c96fa2;p=emacs.git

* automated/tramp-tests.el (tramp-test19-directory-files-and-attributes)
(tramp-test22-file-times): Check for `file-attributes' equality
only if there is a usable timestamp.
(tramp--test-check-files): Do not use `copy-sequence'.
---

diff --git a/test/ChangeLog b/test/ChangeLog
index d677d13db44..0a9872ba1db 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,11 @@
+2014-04-20  Michael Albinus  <michael.albinus@gmx.de>
+
+	* automated/tramp-tests.el
+	(tramp-test19-directory-files-and-attributes)
+	(tramp-test22-file-times): Check for `file-attributes' equality
+	only if there is a usable timestamp.
+	(tramp--test-check-files): Do not use `copy-sequence'.
+
 2014-04-19  Michael Albinus  <michael.albinus@gmx.de>
 
 	* automated/tramp-tests.el (tramp--test-check-files): Extend test.
diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el
index 2572f9c82e4..f5ba59a02b6 100644
--- a/test/automated/tramp-tests.el
+++ b/test/automated/tramp-tests.el
@@ -1012,14 +1012,22 @@ This tests also `file-readable-p' and `file-regular-p'."
 	  (write-region "boz" nil (expand-file-name "boz" tmp-name2))
 	  (setq attr (directory-files-and-attributes tmp-name2))
 	  (should (consp attr))
+	  ;; Dumb remote shells without perl(1) or stat(1) are not
+	  ;; able to return the date correctly.  They say "don't know".
 	  (dolist (elt attr)
-	    (should
-	     (equal (file-attributes (expand-file-name (car elt) tmp-name2))
-		    (cdr elt))))
+	    (unless
+		(equal
+		 (nth 5
+		      (file-attributes (expand-file-name (car elt) tmp-name2)))
+		 '(0 0))
+	      (should
+	       (equal (file-attributes (expand-file-name (car elt) tmp-name2))
+		      (cdr elt)))))
 	  (setq attr (directory-files-and-attributes tmp-name2 'full))
 	  (dolist (elt attr)
-	    (should
-	     (equal (file-attributes (car elt)) (cdr elt))))
+	    (unless (equal (nth 5 (file-attributes (car elt))) '(0 0))
+	      (should
+	       (equal (file-attributes (car elt)) (cdr elt)))))
 	  (setq attr (directory-files-and-attributes tmp-name2 nil "^b"))
 	  (should (equal (mapcar 'car attr) '("bar" "boz"))))
       (ignore-errors (delete-directory tmp-name1 'recursive)))))
@@ -1142,16 +1150,16 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 	  ;; We skip the test, if the remote handler is not able to
 	  ;; set the correct time.
 	  (skip-unless (set-file-times tmp-name1 '(0 1)))
-	  ;; Dumb busyboxes are not able to return the date correctly.
-	  ;; They say "don't know.
-	  (skip-unless (not (equal (nth 5 (file-attributes tmp-name1)) '(0 0))))
-	  (should (equal (nth 5 (file-attributes tmp-name1)) '(0 1)))
-	  (write-region "bla" nil tmp-name2)
-	  (should (file-exists-p tmp-name2))
-	  (should (file-newer-than-file-p tmp-name2 tmp-name1))
-	  ;; `tmp-name3' does not exist.
-	  (should (file-newer-than-file-p tmp-name2 tmp-name3))
-	  (should-not (file-newer-than-file-p tmp-name3 tmp-name1)))
+	  ;; Dumb remote shells without perl(1) or stat(1) are not
+	  ;; able to return the date correctly.  They say "don't know".
+	  (unless (equal (nth 5 (file-attributes tmp-name1)) '(0 0))
+	    (should (equal (nth 5 (file-attributes tmp-name1)) '(0 1)))
+	    (write-region "bla" nil tmp-name2)
+	    (should (file-exists-p tmp-name2))
+	    (should (file-newer-than-file-p tmp-name2 tmp-name1))
+	    ;; `tmp-name3' does not exist.
+	    (should (file-newer-than-file-p tmp-name2 tmp-name3))
+	    (should-not (file-newer-than-file-p tmp-name3 tmp-name1))))
       (ignore-errors
 	(delete-file tmp-name1)
 	(delete-file tmp-name2)))))
@@ -1447,7 +1455,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 			 (sort (copy-sequence files) 'string-lessp)))
 	  (should (equal (directory-files
 			  tmp-name2 nil directory-files-no-dot-files-regexp)
-			 (sort (copy-sequence files) 'string-lessp))))
+			 (sort files 'string-lessp))))
       (ignore-errors (delete-directory tmp-name1 'recursive))
       (ignore-errors (delete-directory tmp-name2 'recursive))))))