Patchwork tests: allow more flexibility in git diffstat output

login
register
mail settings
Submitter Matt Harbison
Date Dec. 13, 2014, 5:04 p.m.
Message ID <op.xqtgdsw99lwrgf@envy>
Download mbox | patch
Permalink /patch/7076/
State Accepted
Headers show

Comments

Matt Harbison - Dec. 13, 2014, 5:04 p.m.
On Sat, 13 Dec 2014 10:40:44 -0500, Mathias De Maré  
<mathias.demare@gmail.com> wrote:

> # HG changeset patch
> # User Mathias De Maré <mathias.demare@gmail.com>
> # Date 1418460300 -3600
> #      Sam Dez 13 09:45:00 2014 +0100
> # Node ID eaf33fff7f2c31a5cc57b95898255221b0e3dc6f
> # Parent  495bc1b65d25872324a0220354f048b220304bd1
> tests: allow more flexibility in git diffstat output
>

This fixed the original spacing problem, but leaves this:


ERROR: test-subrepo-git.t output changed
!
Failed test-subrepo-git.t: output changed

I guess regex the singular/plural too, or maybe make it report 2 or more  
deletions to avoid the issue?

--Matt
Mathias De Maré - Dec. 14, 2014, 10:54 a.m.
On Sat, Dec 13, 2014 at 6:04 PM, Matt Harbison <mharbison72@gmail.com>
wrote:
>
> On Sat, 13 Dec 2014 10:40:44 -0500, Mathias De Maré <
> mathias.demare@gmail.com> wrote:
>
>  # HG changeset patch
>> # User Mathias De Maré <mathias.demare@gmail.com>
>> # Date 1418460300 -3600
>> #      Sam Dez 13 09:45:00 2014 +0100
>> # Node ID eaf33fff7f2c31a5cc57b95898255221b0e3dc6f
>> # Parent  495bc1b65d25872324a0220354f048b220304bd1
>> tests: allow more flexibility in git diffstat output
>>
>>
> This fixed the original spacing problem, but leaves this:
>
> --- /home/matt/hg/tests/test-subrepo-git.t
> +++ /home/matt/hg/tests/test-subrepo-git.t.err
> @@ -778,7 +778,7 @@
>    $ hg diff --subrepos --stat
>    \s*barfoo |\s*1 + (re)
>    \s*foobar |\s*2 +- (re)
> -   2 files changed, 2 insertions(+), 1 deletion(-) (no-eol)
> +   2 files changed, 2 insertions(+), 1 deletions(-) (no-eol)
>
>  ensure adding include/exclude ignores the subrepo
>    $ hg diff --subrepos -I s/foobar
>
> ERROR: test-subrepo-git.t output changed
> !
> Failed test-subrepo-git.t: output changed
>
> I guess regex the singular/plural too, or maybe make it report 2 or more
> deletions to avoid the issue?
>
Thanks for testing this! I missed that last change, I'll send a new patch
for that.

Greetings,
Mathias

>
> --Matt
>

Patch

--- /home/matt/hg/tests/test-subrepo-git.t
+++ /home/matt/hg/tests/test-subrepo-git.t.err
@@ -778,7 +778,7 @@ 
    $ hg diff --subrepos --stat
    \s*barfoo |\s*1 + (re)
    \s*foobar |\s*2 +- (re)
-   2 files changed, 2 insertions(+), 1 deletion(-) (no-eol)
+   2 files changed, 2 insertions(+), 1 deletions(-) (no-eol)

  ensure adding include/exclude ignores the subrepo
    $ hg diff --subrepos -I s/foobar