[PATCH v2 stable] tests: test-lock-badness.t message could come later

[Augie Fackler]

On Sun, Apr 24, 2016 at 01:20:29AM +0000, timeless wrote:
> # HG changeset patch
> # User timeless <timeless at mozdev.org>
> # Date 0 0
> #      Thu Jan 01 00:00:00 1970 +0000
> # Branch stable
> # Node ID a500d20736b6b9cda94fa21dce930bad21e3b325
> # Parent  51f5fae84e4381761c43c6156b3d6caf495529f8
> # Available At bb://timeless/mercurial-crew
> #              hg pull bb://timeless/mercurial-crew -r a500d20736b6
> tests: test-lock-badness.t message could come later

queued this, thanks

>
> I got this on gcc112:
> @@ -58,8 +58,8 @@
>    $ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout &
>    $ hg -R b up -q --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf"
>    waiting for lock on working directory of b held by '*:*' (glob)
> -  got lock after ? seconds (glob)
>    $ wait
> +  got lock after 1 seconds
>    $ cat stdout
>    adding b
>
> diff -r 51f5fae84e43 -r a500d20736b6 tests/test-lock-badness.t
> --- a/tests/test-lock-badness.t	Thu Apr 21 10:11:20 2016 -0400
> +++ b/tests/test-lock-badness.t	Thu Jan 01 00:00:00 1970 +0000
> @@ -56,10 +56,12 @@
>    > EOF
>    $ echo b > b/b
>    $ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout &
> -  $ hg -R b up -q --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf"
> +  $ hg -R b up -q --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf" \
> +  > > preup 2>&1
> +  $ wait
> +  $ cat preup
>    waiting for lock on working directory of b held by '*:*' (glob)
> -  got lock after ? seconds (glob)
> -  $ wait
> +  got lock after * seconds (glob)
>    $ cat stdout
>    adding b
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel