[PATCH] tests: match time by a glob to fix intermittent failures of test-lock-badness.t

Simon Heimberg simohe at besonet.ch
Thu Mar 6 14:01:12 CST 2014


# HG changeset patch
# User Simon Heimberg <simohe at besonet.ch>
# Date 1394024588 -3600
#      Wed Mar 05 14:03:08 2014 +0100
# Node ID 55e276ad976cd1aac3860a254ada72ecf1056d11
# Parent  779ceb84f4f782d32dfe47f6684107c08d2f6142
tests: match time by a glob to fix intermittent failures of test-lock-badness.t

Sometimes the lock was a bit slower and took 2 seconds. Do not fail the test by
this.
The glob ? matches from 0 to 9 seconds, which should be enough safety.

diff -r 779ceb84f4f7 -r 55e276ad976c tests/test-lock-badness.t
--- a/tests/test-lock-badness.t	Tue Mar 04 09:56:59 2014 -0600
+++ b/tests/test-lock-badness.t	Wed Mar 05 14:03:08 2014 +0100
@@ -22,7 +22,7 @@
   $ 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 1 seconds
+  got lock after ? seconds (glob)
   warning: ignoring unknown working parent d2ae7f538514!
   $ wait
   $ cat stdout


More information about the Mercurial-devel mailing list