( )⚙ D10753 persistent-nodemap: add a way to make the picked uid predictable

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10753

persistent-nodemap: add a way to make the picked uid predictable
ClosedPublic

Authored by marmoute on May 20 2021, 10:18 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG9a3aa54774ff: persistent-nodemap: add a way to make the picked uid predictable
Summary

This will make the test less volatile and therefore easier to maintain. I am
setting this is for the persistent nodemap docket first, but my target is to use
similar logic for the revlogv2 (and co) test.

For persisent nodemap, they are too many different in how each test variants (with rust, without rust, etc) needs new uid for this be really useful (right now). However it will be directly useful for the revlogv2 logic.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlogutils/nodemap.py (42 lines)
Mtests/run-tests.py (2 lines)

Diff 28186

mercurial/revlogutils/nodemap.py

# nodemap.py - nodemap related code and utilities # nodemap.py - nodemap related code and utilities
# #
# Copyright 2019 Pierre-Yves David <pierre-yves.david@octobus.net> # Copyright 2019 Pierre-Yves David <pierre-yves.david@octobus.net>
# Copyright 2019 George Racinet <georges.racinet@octobus.net> # Copyright 2019 George Racinet <georges.racinet@octobus.net>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import errno import errno
import os import os
import random
import re import re
import struct import struct
from ..node import hex from ..node import hex
from .. import ( from .. import (
encoding,
error, error,
pycompat,
util, util,
) )
class NodeMap(dict): class NodeMap(dict):
def __missing__(self, x): def __missing__(self, x):
raise error.RevlogError(b'unknown node: %s' % x) raise error.RevlogError(b'unknown node: %s' % x)
def _make_uid(): def _make_uid():
"""return a new unique identifier. """return a new unique identifier.
The identifier is random and composed of ascii characters.""" The identifier is random and composed of ascii characters."""
return hex(os.urandom(ID_SIZE)) return hex(os.urandom(ID_SIZE))
# some special test logic to avoid anoying random output in the test
stable_docket_file = encoding.environ.get(b'HGTEST_DOCKETIDFILE')
if stable_docket_file:
def _make_uid():
try:
with open(stable_docket_file, mode='rb') as f:
seed = f.read().strip()
except IOError as inst:
if inst.errno != errno.ENOENT:
raise
seed = b'4' # chosen by a fair dice roll. garanteed to be random
if pycompat.ispy3:
iter_seed = iter(seed)
else:
iter_seed = (ord(c) for c in seed)
# some basic circular sum hashing on 64 bits
int_seed = 0
low_mask = int('1' * 35, 2)
for i in iter_seed:
high_part = int_seed >> 35
low_part = (int_seed & low_mask) << 28
int_seed = high_part + low_part + i
r = random.Random()
if pycompat.ispy3:
r.seed(int_seed, version=1)
else:
r.seed(int_seed)
# once we drop python 3.8 support we can simply use r.randbytes
raw = r.getrandbits(ID_SIZE * 8)
assert ID_SIZE == 8
p = struct.pack('>Q', raw)
new = hex(p)
with open(stable_docket_file, 'wb') as f:
f.write(new)
return new
class NodeMapDocket(object): class NodeMapDocket(object):
"""metadata associated with persistent nodemap data """metadata associated with persistent nodemap data
The persistent data may come from disk or be on their way to disk. The persistent data may come from disk or be on their way to disk.
""" """
def __init__(self, uid=None): def __init__(self, uid=None):
if uid is None: if uid is None:

tests/run-tests.py

def defineport(i): def defineport(i):
offset = '' if i == 0 else '%s' % i offset = '' if i == 0 else '%s' % i
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)
docket_id_file = os.path.join(_bytes2sys(self._testtmp), 'DOCKETID')
env['HGTEST_DOCKETIDFILE'] = docket_id_file
env['TESTNAME'] = self.name env['TESTNAME'] = self.name
env['HOME'] = _bytes2sys(self._testtmp) env['HOME'] = _bytes2sys(self._testtmp)
if os.name == 'nt': if os.name == 'nt':
env['REALUSERPROFILE'] = env['USERPROFILE'] env['REALUSERPROFILE'] = env['USERPROFILE']
# py3.8+ ignores HOME: https://bugs.python.org/issue36264 # py3.8+ ignores HOME: https://bugs.python.org/issue36264
env['USERPROFILE'] = env['HOME'] env['USERPROFILE'] = env['HOME']
formated_timeout = _bytes2sys(b"%d" % default_defaults['timeout'][1]) formated_timeout = _bytes2sys(b"%d" % default_defaults['timeout'][1])
env['HGTEST_TIMEOUT_DEFAULT'] = formated_timeout env['HGTEST_TIMEOUT_DEFAULT'] = formated_timeout