Re: [Emacs-diffs] master fd54102: * lisp/files.el (file-size-function): New defcustom

["Mattias Engdegård" <mattiase@acm.org>]

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

20 juli 2019 kl. 18.53 skrev Basil L. Contovounesios <contovob@tcd.ie>:
> 
> [I wish changes like this (and its recent predecessors, which caused
> test failues that others had to fix), even if small, to central
> user-facing features were instead discussed and tested a little before
> being unilaterally pushed.]

So sorry for breaking things, and I'll be more careful. Surely the right correction is to fix the test, unless the change itself somehow was deemed questionable (which I never saw any indication of)?

Proposed patch attached. With it applied, the test passes again.


[-- Attachment #2: 0001-Make-tramp-test-regexp-more-robust.patch --]
[-- Type: application/octet-stream, Size: 1003 bytes --]

From a6ef72c0b6bea52d359858e519ea050a071f1d1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Engdeg=C3=A5rd?= <mattiase@acm.org>
Date: Sat, 20 Jul 2019 19:16:38 +0200
Subject: [PATCH] Make tramp test regexp more robust

* test/lisp/net/tramp-tests.el (tramp-test17-insert-directory):
Match a greater variety of human-readable size values.
---
 test/lisp/net/tramp-tests.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 64ba0414e8..1404ef39d5 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2827,7 +2827,7 @@ tramp--test-print-duration
 	       (looking-at-p
 		(concat
 		 ;; There might be a summary line.
-		 "\\(total.+[[:digit:]]+[KMGTPEZY]?\n\\)?"
+		 "\\(total.+[[:digit:]]+ ?[kKMGTPEZY]?i?B?\n\\)?"
 		 ;; We don't know in which order ".", ".." and "foo" appear.
 		 (format
 		  "\\(.+ %s\\( ->.+\\)?\n\\)\\{%d\\}"
-- 
2.20.1 (Apple Git-117)