* 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 a91392d3fe758a0c1801a12cda95f57943af3e6f..14780c09e6faa79a6367708760045c495272f424 100644 (file)
--- 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 864a43d638f9bb3bf45f7acf310014681ed3525c..317ce12fc8e5a58f1430f7dfe49de7b81b9320c4 100644 (file)
--- 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 ()