summaryrefslogtreecommitdiff
path: root/test/automated/tramp-tests.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2014-12-25 22:00:08 +0100
committerMichael Albinus <michael.albinus@gmx.de>2014-12-25 22:00:08 +0100
commit4cd6d77375ef9adeaa53fd05b12283195d99d74c (patch)
tree358220155ad21ac6892c3600add32b6f3e9093d3 /test/automated/tramp-tests.el
parenta41d07b329c034ad34e442bef93b6fcaeb556f9f (diff)
downloademacs-4cd6d77375ef9adeaa53fd05b12283195d99d74c.tar.gz
emacs-4cd6d77375ef9adeaa53fd05b12283195d99d74c.tar.bz2
emacs-4cd6d77375ef9adeaa53fd05b12283195d99d74c.zip
* automated/tramp-tests.el (tramp-test17-insert-directory): Do not
expect a given order of "." and "..".
Diffstat (limited to 'test/automated/tramp-tests.el')
-rw-r--r--test/automated/tramp-tests.el7
1 files changed, 6 insertions, 1 deletions
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 ()