[PATCH] test-shelve: be more lenient about whitespace (issue4124)

Jordi Gutiérrez Hermoso jordigh at octave.org
Mon Mar 9 16:36:04 UTC 2015


# HG changeset patch
# User Tristan Seligmann <mithrandi at debian.org> (communicated by Jordi Gutiérrez Hermoso <jordigh at 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.

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


More information about the Mercurial-devel mailing list