Mercurial > hg
comparison tests/test-lock-badness.t @ 46015:f44b9c72f061
run-tests: allow some slack about 'waiting on lock' message
It is common to run the tests on very loaded machine when concurrent run might
take a bit longer. Such message are usually harmless, but anoying as they break
the tests.
Test that explicitly depends on this value have been adjusted. This make them
more robust anyway.
A fun case was `test-clone-pull-corruption.t` which, without the previous
changeset introducing extra flushing, ended use having a line 31 (`pulling from
../source`) changing order because the warning message was no longer flushing
stdin before using stderr (stderr being invisible in the test).
Differential Revision: https://phab.mercurial-scm.org/D9507
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 02 Dec 2020 20:10:27 +0100 |
parents | e0dbfbd4062c |
children | adecb1ab4a0d |
comparison
equal
deleted
inserted
replaced
46014:b86608e97fa8 | 46015:f44b9c72f061 |
---|---|
54 > def sleepone(**x): time.sleep(1) | 54 > def sleepone(**x): time.sleep(1) |
55 > def sleephalf(**x): time.sleep(0.5) | 55 > def sleephalf(**x): time.sleep(0.5) |
56 > EOF | 56 > EOF |
57 $ echo b > b/b | 57 $ echo b > b/b |
58 $ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout & | 58 $ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout & |
59 $ hg -R b up -q --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf" \ | 59 $ hg -R b up -q --config ui.timeout.warn=0 --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf" \ |
60 > > preup-stdout 2>preup-stderr | 60 > > preup-stdout 2>preup-stderr |
61 $ wait | 61 $ wait |
62 $ cat preup-stdout | 62 $ cat preup-stdout |
63 $ cat preup-stderr | 63 $ cat preup-stderr |
64 waiting for lock on working directory of b held by process '*' on host '*' (glob) | 64 waiting for lock on working directory of b held by process '*' on host '*' (glob) |