[PATCH 1 of 3] run-tests: use more explicit criteria for detecting no-eol

Augie Fackler raf at durin42.com
Tue Oct 9 19:56:43 CDT 2012


Series looks good here, but I only did a quick pass.

On Oct 9, 2012, at 6:41 PM, Mads Kiilerich wrote:

> # HG changeset patch
> # User Mads Kiilerich <mads at kiilerich.com>
> # Date 1349825873 -7200
> # Node ID 237c947af3cbc80516c959b4ea1c8f8ccb2151fa
> # Parent  5b08e8b7ab00ccac86da4384d918481865266ff4
> run-tests: use more explicit criteria for detecting no-eol
> 
> Preparing for the situation where there could be unsalted lines not terminated
> with \n.
> 
> diff --git a/tests/run-tests.py b/tests/run-tests.py
> --- a/tests/run-tests.py
> +++ b/tests/run-tests.py
> @@ -690,8 +690,7 @@
>             lout, lcmd = l.split(salt, 1)
> 
>         if lout:
> -            if lcmd:
> -                # output block had no trailing newline, clean up
> +            if not lout.endswith('\n'):
>                 lout += ' (no-eol)\n'
> 
>             # find the expected output at the current position
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel



More information about the Mercurial-devel mailing list