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

Augie Fackler raf at durin42.com
Fri Apr 22 14:07:02 EDT 2016


On Thu, Apr 21, 2016 at 06:08:50AM +0000, timeless wrote:
> # HG changeset patch
> # User timeless <timeless at mozdev.org>
> # Date 0 0
> #      Thu Jan 01 00:00:00 1970 +0000

o_O?

> # Branch stable
> # Node ID 8a4d0d92079e716c6addc7229353fe3f8941b28a
> # Parent  1967c6b714e6bc2e3ffe7ea0197a5f2b42b53320
> # Available At bb://timeless/mercurial-crew
> #              hg pull bb://timeless/mercurial-crew -r 8a4d0d92079e
> tests: test-lock-badness.t message could come later
>
> 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 1967c6b714e6 -r 8a4d0d92079e tests/test-lock-badness.t
> --- a/tests/test-lock-badness.t	Fri Apr 15 14:28:26 2016 -0700
> +++ b/tests/test-lock-badness.t	Thu Jan 01 00:00:00 1970 +0000
> @@ -58,8 +58,9 @@
>    $ 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)
> +  got lock after * seconds (glob) (?)
>    $ wait
> +  got lock after * seconds (glob) (?)

Is it an important part of this test that we print the "got lock
after" message? This test no longer verifies that the message was
printed as now stated...

>    $ cat stdout
>    adding b
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list