From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 25 Dec 2014 21:00:08 +0000 (+0100)
Subject: * automated/tramp-tests.el (tramp-test17-insert-directory): Do not
X-Git-Tag: emacs-24.4.90~102
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4cd6d77;p=emacs.git

* automated/tramp-tests.el (tramp-test17-insert-directory): Do not
expect a given order of "." and "..".
---

diff --git a/test/ChangeLog b/test/ChangeLog
index a91392d3fe7..14780c09e6f 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	* automated/tramp-tests.el (tramp-test17-insert-directory): Do not
+	expect a given order of "." and "..".
+
 2014-12-22  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
 	* automated/python-tests.el (python-indent-electric-colon-2)
diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el
index 864a43d638f..317ce12fc8e 100644
--- a/test/automated/tramp-tests.el
+++ b/test/automated/tramp-tests.el
@@ -953,7 +953,12 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
 	    (goto-char (point-min))
 	    (should
 	     (looking-at-p
-	      "\\(total.+[[:digit:]]+\n\\)?.+ \\.\n.+ \\.\\.\n.+ foo$"))))
+	      (concat
+	       ;; There might be a summary line.
+	       "\\(total.+[[:digit:]]+\n\\)?"
+	       ;; We don't know in which order "." and ".." appear.
+	       "\\(.+ \\.?\\.\n\\)\\{2\\}"
+	       ".+ foo$")))))
       (ignore-errors (delete-directory tmp-name1 'recursive)))))
 
 (ert-deftest tramp-test18-file-attributes ()