all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Przemysław Wojnowski" <esperanto@cumego.com>
To: emacs-devel@gnu.org
Subject: [PATCH] Fix tramp test
Date: Sun, 22 Feb 2015 13:25:10 +0100	[thread overview]
Message-ID: <54E9CAA6.8010205@cumego.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 262 bytes --]

Hello everybody,

A tiny patch for a test that fails in non English systems. OS output summary is
language dependent and for example in Polish it displays "razem 1234" instead of
"total 1234".

Please let me know if it can't be applied for some reason.

Thanks!

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-tramp-test.patch --]
[-- Type: text/x-patch; name="0001-Fix-tramp-test.patch", Size: 1407 bytes --]

From 214424ee32c7723e34924b220eb9f9a33881f9f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Wojnowski?= <esperanto@cumego.com>
Date: Sun, 22 Feb 2015 13:12:02 +0100
Subject: [PATCH] Fix tramp test.

Make summary line text matching working in non English systems too.
---
 test/ChangeLog                | 4 ++++
 test/automated/tramp-tests.el | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/ChangeLog b/test/ChangeLog
index 656124e..44e9444 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,5 +1,9 @@
 2015-02-22  Przemysław Wojnowski  <esperanto@cumego.com>
 
+	* automated/tramp-tests.el (tramp-test17-insert-directory):
+	Fix test. Make summary line text matching working in non English
+	systems too.
+
 	* automated/cl-lib-tests.el: New tests.
 	(cl-digit-char-p): Check returned value.
 
diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el
index 2c4610c..e60a13f 100644
--- a/test/automated/tramp-tests.el
+++ b/test/automated/tramp-tests.el
@@ -955,7 +955,7 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
 	     (looking-at-p
 	      (concat
 	       ;; There might be a summary line.
-	       "\\(total.+[[:digit:]]+\n\\)?"
+	       "\\([[:alpha:]].+[[:digit:]]+\n\\)?"
 	       ;; We don't know in which order "." and ".." appear.
 	       "\\(.+ \\.?\\.\n\\)\\{2\\}"
 	       ".+ foo$")))))
-- 
2.1.0


             reply	other threads:[~2015-02-22 12:25 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-22 12:25 Przemysław Wojnowski [this message]
2015-02-22 14:14 ` [PATCH] Fix tramp test Michael Albinus
2015-02-22 16:00   ` Eli Zaretskii
2015-02-22 16:25     ` Michael Albinus
2015-02-22 17:10       ` Eli Zaretskii
2015-02-22 19:01         ` Michael Albinus
2015-02-22 19:33           ` Przemysław Wojnowski
2015-02-22 20:53           ` Andreas Schwab
2015-02-22 21:46             ` Michael Albinus
2015-02-22 17:07     ` Eli Zaretskii

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=54E9CAA6.8010205@cumego.com \
    --to=esperanto@cumego.com \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.