This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9507

run-tests: allow some slack about 'waiting on lock' message
ClosedPublic

Authored by marmoute on Dec 2 2020, 5:19 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf44b9c72f061: run-tests: allow some slack about 'waiting on lock' message
Summary

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).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Dec 2 2020, 5:19 PM
pulkit accepted this revision.Dec 3 2020, 3:14 AM
This revision is now accepted and ready to land.Dec 3 2020, 3:14 AM

Revision Contents
Changeset List

Diff 23992

tests/run-tests.py

with open(path, 'wb') as hgrc: with open(path, 'wb') as hgrc:
hgrc.write(b'[ui]\n') hgrc.write(b'[ui]\n')
hgrc.write(b'slash = True\n') hgrc.write(b'slash = True\n')
hgrc.write(b'interactive = False\n') hgrc.write(b'interactive = False\n')
hgrc.write(b'detailed-exit-code = True\n') hgrc.write(b'detailed-exit-code = True\n')
hgrc.write(b'merge = internal:merge\n') hgrc.write(b'merge = internal:merge\n')
hgrc.write(b'mergemarkers = detailed\n') hgrc.write(b'mergemarkers = detailed\n')
hgrc.write(b'promptecho = True\n') hgrc.write(b'promptecho = True\n')
hgrc.write(b'timeout.warn=15\n')
hgrc.write(b'[defaults]\n') hgrc.write(b'[defaults]\n')
hgrc.write(b'[devel]\n') hgrc.write(b'[devel]\n')
hgrc.write(b'all-warnings = true\n') hgrc.write(b'all-warnings = true\n')
hgrc.write(b'default-date = 0 0\n') hgrc.write(b'default-date = 0 0\n')
hgrc.write(b'[largefiles]\n') hgrc.write(b'[largefiles]\n')
hgrc.write( hgrc.write(
b'usercache = %s\n' b'usercache = %s\n'
% (os.path.join(self._testtmp, b'.cache/largefiles')) % (os.path.join(self._testtmp, b'.cache/largefiles'))

tests/test-basic.t

Create a repository: Create a repository:
#if no-extraextensions #if no-extraextensions
$ hg config $ hg config
devel.all-warnings=true devel.all-warnings=true
devel.default-date=0 0 devel.default-date=0 0
extensions.fsmonitor= (fsmonitor !) extensions.fsmonitor= (fsmonitor !)
largefiles.usercache=$TESTTMP/.cache/largefiles largefiles.usercache=$TESTTMP/.cache/largefiles
lfs.usercache=$TESTTMP/.cache/lfs lfs.usercache=$TESTTMP/.cache/lfs
ui.slash=True ui.slash=True
ui.interactive=False ui.interactive=False
ui.detailed-exit-code=True ui.detailed-exit-code=True
ui.merge=internal:merge ui.merge=internal:merge
ui.mergemarkers=detailed ui.mergemarkers=detailed
ui.promptecho=True ui.promptecho=True
ui.timeout.warn=15
web.address=localhost web.address=localhost
web\.ipv6=(?:True|False) (re) web\.ipv6=(?:True|False) (re)
web.server-header=testing stub value web.server-header=testing stub value
#endif #endif
$ hg init t $ hg init t
$ cd t $ cd t

tests/test-commandserver.t

extensions.fsmonitor= (fsmonitor !) extensions.fsmonitor= (fsmonitor !)
largefiles.usercache=$TESTTMP/.cache/largefiles largefiles.usercache=$TESTTMP/.cache/largefiles
lfs.usercache=$TESTTMP/.cache/lfs lfs.usercache=$TESTTMP/.cache/lfs
ui.slash=True ui.slash=True
ui.interactive=False ui.interactive=False
ui.detailed-exit-code=True ui.detailed-exit-code=True
ui.merge=internal:merge ui.merge=internal:merge
ui.mergemarkers=detailed ui.mergemarkers=detailed
ui.timeout.warn=15
ui.foo=bar ui.foo=bar
ui.nontty=true ui.nontty=true
web.address=localhost web.address=localhost
web\.ipv6=(?:True|False) (re) web\.ipv6=(?:True|False) (re)
web.server-header=testing stub value web.server-header=testing stub value
*** runcommand init foo *** runcommand init foo
*** runcommand -R foo showconfig ui defaults *** runcommand -R foo showconfig ui defaults
ui.slash=True ui.slash=True
ui.interactive=False ui.interactive=False
ui.detailed-exit-code=True ui.detailed-exit-code=True
ui.merge=internal:merge ui.merge=internal:merge
ui.mergemarkers=detailed ui.mergemarkers=detailed
ui.timeout.warn=15
ui.nontty=true ui.nontty=true
#endif #endif
$ rm -R foo $ rm -R foo
#if windows #if windows
$ PYTHONPATH="$TESTTMP/repo;$PYTHONPATH" $ PYTHONPATH="$TESTTMP/repo;$PYTHONPATH"
#else #else

tests/test-lock-badness.t

$ cat > hooks.py << EOF $ cat > hooks.py << EOF
> import time > import time
> def sleepone(**x): time.sleep(1) > def sleepone(**x): time.sleep(1)
> def sleephalf(**x): time.sleep(0.5) > def sleephalf(**x): time.sleep(0.5)
> EOF > EOF
$ echo b > b/b $ echo b > b/b
$ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout & $ 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 ui.timeout.warn=0 --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf" \
> > preup-stdout 2>preup-stderr > > preup-stdout 2>preup-stderr
$ wait $ wait
$ cat preup-stdout $ cat preup-stdout
$ cat preup-stderr $ cat preup-stderr
waiting for lock on working directory of b held by process '*' on host '*' (glob) waiting for lock on working directory of b held by process '*' on host '*' (glob)
got lock after * seconds (glob) got lock after * seconds (glob)
$ cat stdout $ cat stdout
adding b adding b

tests/test-phases-exchange.t

cannot lock source repo, skipping local public phase update cannot lock source repo, skipping local public phase update
[1] [1]
$ chmod -R +w .hg $ chmod -R +w .hg
3. Test that push is prevented if lock was already acquired (not a permission 3. Test that push is prevented if lock was already acquired (not a permission
error, but EEXIST) error, but EEXIST)
$ touch .hg/store/lock $ touch .hg/store/lock
$ hg push ../Phi --config ui.timeout=1 $ hg push ../Phi --config ui.timeout=1 --config ui.timeout.warn=0
pushing to ../Phi pushing to ../Phi
waiting for lock on repository $TESTTMP/Upsilon held by '' waiting for lock on repository $TESTTMP/Upsilon held by ''
abort: repository $TESTTMP/Upsilon: timed out waiting for lock held by '' abort: repository $TESTTMP/Upsilon: timed out waiting for lock held by ''
(lock might be very busy) (lock might be very busy)
[20] [20]
$ rm .hg/store/lock $ rm .hg/store/lock
$ cd .. $ cd ..