This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10937

testing: fix _timeout_factor
ClosedPublic

Authored by marmoute on Jul 2 2021, 6:36 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG2dac94edd98d: testing: fix _timeout_factor
Summary

With --debug, run-tests.py set the timeout to 0... that breaks the logic in
mercurial.testing.

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.Jul 2 2021, 6:36 PM
pulkit accepted this revision.Jul 3 2021, 7:46 AM
This revision is now accepted and ready to land.Jul 3 2021, 7:46 AM
baymax updated this revision to Diff 28821.Jul 6 2021, 10:14 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHG2dac94edd98d: testing: fix _timeout_factor.Jul 6 2021, 10:34 AM
Closed by commit rHG2dac94edd98d: testing: fix _timeout_factor (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/testing/__init__.py (4 lines)

Diff 28829

mercurial/testing/__init__.py

# #
# This is a simple log level module doing simple test related work, we can't # This is a simple log level module doing simple test related work, we can't
# import more things, and we do not need it. # import more things, and we do not need it.
environ = getattr(os, 'environ') environ = getattr(os, 'environ')
def _timeout_factor(): def _timeout_factor():
"""return the current modification to timeout""" """return the current modification to timeout"""
default = int(environ.get('HGTEST_TIMEOUT_DEFAULT', 1)) default = int(environ.get('HGTEST_TIMEOUT_DEFAULT', 360))
current = int(environ.get('HGTEST_TIMEOUT', default)) current = int(environ.get('HGTEST_TIMEOUT', default))
if current == 0:
return 1
return current / float(default) return current / float(default)
def wait_file(path, timeout=10): def wait_file(path, timeout=10):
timeout *= _timeout_factor() timeout *= _timeout_factor()
start = time.time() start = time.time()
while not os.path.exists(path): while not os.path.exists(path):
if time.time() - start > timeout: if time.time() - start > timeout:
raise RuntimeError(b"timed out waiting for file: %s" % path) raise RuntimeError(b"timed out waiting for file: %s" % path)
time.sleep(0.01) time.sleep(0.01)
def write_file(path, content=b''): def write_file(path, content=b''):
with open(path, 'wb') as f: with open(path, 'wb') as f:
f.write(content) f.write(content)