Patchwork test-shelve: be more lenient about whitespace (issue4124)

login
register
mail settings
Submitter Jordi Gutiérrez Hermoso
Date March 9, 2015, 4:36 p.m.
Message ID <5b2bf357048a2f110d06.1425918964@Iris>
Download mbox | patch
Permalink /patch/7950/
State Accepted
Headers show

Comments

Jordi Gutiérrez Hermoso - March 9, 2015, 4:36 p.m.
# HG changeset patch
# User Tristan Seligmann <mithrandi@debian.org> (communicated by Jordi Gutiérrez Hermoso <jordigh@octave.org>)
# Date 1425918749 14400
#      Mon Mar 09 12:32:29 2015 -0400
# Node ID 5b2bf357048a2f110d067aa3c4ed6d543b8f0991
# Parent  02d7b5cd373bbb4e8263dad9bfbf9c4c3b0e4e3a
test-shelve: be more lenient about whitespace (issue4124)

When running on a slower system (eg. MIPS buildd), the age of the
shelf can be 10 seconds or more, resulting in the output alignment
changing and thus a test failure. This patch makes the spacing be
matched more leniently.
Matt Mackall - March 9, 2015, 7:07 p.m.
On Mon, 2015-03-09 at 12:36 -0400, Jordi Gutiérrez Hermoso wrote:
> # HG changeset patch
> # User Tristan Seligmann <mithrandi@debian.org> (communicated by Jordi Gutiérrez Hermoso <jordigh@octave.org>)

Let's not ad-hoc invent new metadata formats. Check-commit says hi.

> # Date 1425918749 14400
> #      Mon Mar 09 12:32:29 2015 -0400
> # Node ID 5b2bf357048a2f110d067aa3c4ed6d543b8f0991
> # Parent  02d7b5cd373bbb4e8263dad9bfbf9c4c3b0e4e3a
> test-shelve: be more lenient about whitespace (issue4124)

Queued for stable, thanks.
Jordi Gutiérrez Hermoso - March 9, 2015, 7:22 p.m.
On Mon, 2015-03-09 at 14:07 -0500, Matt Mackall wrote:
> On Mon, 2015-03-09 at 12:36 -0400, Jordi Gutiérrez Hermoso wrote:
> > # HG changeset patch
> > # User Tristan Seligmann <mithrandi@debian.org> (communicated by Jordi Gutiérrez Hermoso <jordigh@octave.org>)
> 
> Let's not ad-hoc invent new metadata formats. Check-commit says hi.

I figured that's why the user field was completely free-form. :-)

Patch

diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -81,11 +81,11 @@  the common case - no options or filename
 ensure that our shelved changes exist
 
   $ hg shelve -l
-  default-01      (*)    changes to '[mq]: second.patch' (glob)
-  default         (*)    changes to '[mq]: second.patch' (glob)
+  default-01      (*)* changes to '[mq]: second.patch' (glob)
+  default         (*)* changes to '[mq]: second.patch' (glob)
 
   $ hg shelve -l -p default
-  default         (*)    changes to '[mq]: second.patch' (glob)
+  default         (*)* changes to '[mq]: second.patch' (glob)
   
   diff --git a/a/a b/a/a
   --- a/a/a