[Emacs-diffs] emacs-24 4cd6d77: * automated/tramp-tests.el (tramp-test17-insert-directory): Do not

[Michael Albinus]

branch: emacs-24
commit 4cd6d77375ef9adeaa53fd05b12283195d99d74c
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    * automated/tramp-tests.el (tramp-test17-insert-directory): Do not
    expect a given order of "." and "..".
---
 test/ChangeLog                |    5 +++++
 test/automated/tramp-tests.el |    7 ++++++-
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/test/ChangeLog b/test/ChangeLog
index a91392d..14780c0 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-25  Michael Albinus  <address@hidden>
+
+       * automated/tramp-tests.el (tramp-test17-insert-directory): Do not
+       expect a given order of "." and "..".
+
 2014-12-22  Fabián Ezequiel Gallina  <address@hidden>
 
        * automated/python-tests.el (python-indent-electric-colon-2)
diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el
index 864a43d..317ce12 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 ()