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

login
register
mail settings
Submitter timeless
Date April 21, 2016, 6:08 a.m.
Message ID <8a4d0d92079e716c6add.1461218930@gcc2-power8.osuosl.org>
Download mbox | patch
Permalink /patch/14753/
State Superseded
Commit 38292b227debf6393dc1e2c6ff886f85f6673646
Delegated to: Augie Fackler
Headers show

Comments

timeless - April 21, 2016, 6:08 a.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 0 0
#      Thu Jan 01 00:00:00 1970 +0000
# 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
Augie Fackler - April 22, 2016, 6:07 p.m.
On Thu, Apr 21, 2016 at 06:08:50AM +0000, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@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@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
timeless - April 22, 2016, 6:44 p.m.
Not sure what caused the dates.

We can redirect standard out and standard error to a file and then cat the
file after the wait statement...
On Apr 22, 2016 2:07 PM, "Augie Fackler" <raf@durin42.com> wrote:

> On Thu, Apr 21, 2016 at 06:08:50AM +0000, timeless wrote:
> > # HG changeset patch
> > # User timeless <timeless@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@mercurial-scm.org
> > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
Augie Fackler - April 22, 2016, 6:52 p.m.
On Fri, Apr 22, 2016 at 2:44 PM, timeless <timeless@gmail.com> wrote:
> Not sure what caused the dates.
>
> We can redirect standard out and standard error to a file and then cat the
> file after the wait statement...

That sounds safer to me. Can you send that?

Thansk!

Patch

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) (?)
   $ cat stdout
   adding b