This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8316

testlib: adjust wait-on-file timeout according to the global test timeout
ClosedPublic

Authored by marmoute on Mar 20 2020, 7:07 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG82543879b48e: testlib: adjust wait-on-file timeout according to the global test timeout
Summary

Lets assume that if test timeout have been set to be twice as long, it means
local timeout should be twice as long too.

I am not aware of any case were extending timeout for file based synchronisation
was necessary, but the safety seems simple to implements.

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.Mar 20 2020, 7:07 PM
marmoute updated this revision to Diff 20896.Mar 26 2020, 9:12 AM
marmoute added a commit: rHG82543879b48e: testlib: adjust wait-on-file timeout according to the global test timeout.Apr 1 2020, 11:21 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG82543879b48e: testlib: adjust wait-on-file timeout according to the global test timeout (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (7 lines)
Mtests/testlib/wait-on-file (6 lines)

Diff 20931

tests/run-tests.py

else: else:
raise AssertionError('Could not find Python interpreter') raise AssertionError('Could not find Python interpreter')
PYTHON = _sys2bytes(sysexecutable.replace('\\', '/')) PYTHON = _sys2bytes(sysexecutable.replace('\\', '/'))
IMPL_PATH = b'PYTHONPATH' IMPL_PATH = b'PYTHONPATH'
if 'java' in sys.platform: if 'java' in sys.platform:
IMPL_PATH = b'JYTHONPATH' IMPL_PATH = b'JYTHONPATH'
defaults = { default_defaults = {
'jobs': ('HGTEST_JOBS', multiprocessing.cpu_count()), 'jobs': ('HGTEST_JOBS', multiprocessing.cpu_count()),
'timeout': ('HGTEST_TIMEOUT', 180), 'timeout': ('HGTEST_TIMEOUT', 180),
'slowtimeout': ('HGTEST_SLOWTIMEOUT', 1500), 'slowtimeout': ('HGTEST_SLOWTIMEOUT', 1500),
'port': ('HGTEST_PORT', 20059), 'port': ('HGTEST_PORT', 20059),
'shell': ('HGTEST_SHELL', 'sh'), 'shell': ('HGTEST_SHELL', 'sh'),
} }
defaults = default_defaults.copy()
def canonpath(path): def canonpath(path):
return os.path.realpath(os.path.expanduser(path)) return os.path.realpath(os.path.expanduser(path))
def parselistfiles(files, listtype, warn=True): def parselistfiles(files, listtype, warn=True):
entries = dict() entries = dict()
for filename in files: for filename in files:
env["HGPORT%s" % offset] = '%s' % (self._startport + i) env["HGPORT%s" % offset] = '%s' % (self._startport + i)
env = os.environ.copy() env = os.environ.copy()
env['PYTHONUSERBASE'] = sysconfig.get_config_var('userbase') or '' env['PYTHONUSERBASE'] = sysconfig.get_config_var('userbase') or ''
env['HGEMITWARNINGS'] = '1' env['HGEMITWARNINGS'] = '1'
env['TESTTMP'] = _bytes2sys(self._testtmp) env['TESTTMP'] = _bytes2sys(self._testtmp)
env['TESTNAME'] = self.name env['TESTNAME'] = self.name
env['HOME'] = _bytes2sys(self._testtmp) env['HOME'] = _bytes2sys(self._testtmp)
formated_timeout = _bytes2sys(b"%d" % default_defaults['timeout'][1])
env['HGTEST_TIMEOUT_DEFAULT'] = formated_timeout
env['HGTEST_TIMEOUT'] = _bytes2sys(b"%d" % self._timeout)
# This number should match portneeded in _getport # This number should match portneeded in _getport
for port in xrange(3): for port in xrange(3):
# This list should be parallel to _portmap in _getreplacements # This list should be parallel to _portmap in _getreplacements
defineport(port) defineport(port)
env["HGRCPATH"] = _bytes2sys(os.path.join(self._threadtmp, b'.hgrc')) env["HGRCPATH"] = _bytes2sys(os.path.join(self._threadtmp, b'.hgrc'))
env["DAEMON_PIDS"] = _bytes2sys( env["DAEMON_PIDS"] = _bytes2sys(
os.path.join(self._threadtmp, b'daemon.pids') os.path.join(self._threadtmp, b'daemon.pids')
) )

tests/testlib/wait-on-file

#!/bin/bash #!/bin/bash
# #
# wait up to TIMEOUT seconds until a WAIT_ON_FILE is created. # wait up to TIMEOUT seconds until a WAIT_ON_FILE is created.
# #
# In addition, this script can create CREATE_FILE once it is ready to wait. # In addition, this script can create CREATE_FILE once it is ready to wait.
if [ $# -lt 2 ] || [ $# -gt 3 ]; then if [ $# -lt 2 ] || [ $# -gt 3 ]; then
echo $# echo $#
echo "USAGE: $0 TIMEOUT WAIT_ON_FILE [CREATE_FILE]" echo "USAGE: $0 TIMEOUT WAIT_ON_FILE [CREATE_FILE]"
fi fi
timer="$1" timer="$1"
# if the test timeout have been extended, explicitly extend the provided timer
if [ "$HGTEST_TIMEOUT_DEFAULT" -lt "$HGTEST_TIMEOUT" ]; then
timer=$(( ("$timer" * "$HGTEST_TIMEOUT") / $HGTEST_TIMEOUT_DEFAULT ))
fi
wait_on="$2" wait_on="$2"
create="" create=""
if [ $# -eq 3 ]; then if [ $# -eq 3 ]; then
create="$3" create="$3"
fi fi
if [ -n "$create" ]; if [ -n "$create" ];
then then