##// END OF EJS Templates
testing: stop skipping all Python tests of Rust revlog...
testing: stop skipping all Python tests of Rust revlog This base class was not adapted for the introduction of `InnerRevlog`, which also stopped exposing an `Index` class from `rustext`. As a consequence, `test-rust-ancestor.py` was always skipped (and would have been slightly broken). We remove the skipping conditions from `rustancestorstest`, as they now contradict or repeat those of the base class. Also, `LazyAncestors` objects apparently hold only one reference to the inner revlog (they had previously two references on the Rust index). What matters most of course is the return to `start_count` in these tests, i.e., that there is no memory leak nor double frees. In the Python test, we conflate the presence of the `pyo3_rustext` package with that of `rustext`, as we do not plan to support building one and not the other (we hope to convert fully to PyO3 soon). The skipping is actually done by the base test class.

File last commit:

r53302:cf5b47b8 default
r53302:cf5b47b8 default
Show More
revlog.py
93 lines | 3.2 KiB | text/x-python | PythonLexer
Matt Harbison
typing: add `from __future__ import annotations` to most files...
r52756 from __future__ import annotations
test: extract some generic data and utility from test-rust-ancestor.py...
r44397 import unittest
# picked from test-parse-index2, copied rather than imported
# so that it stays stable even if test-parse-index2 changes or disappears.
data_non_inlined = (
b'\x00\x00\x00\x01\x00\x00\x00\x00\x00\x01D\x19'
b'\x00\x07e\x12\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff'
b'\xff\xff\xff\xff\xd1\xf4\xbb\xb0\xbe\xfc\x13\xbd\x8c\xd3\x9d'
b'\x0f\xcd\xd9;\x8c\x07\x8cJ/\x00\x00\x00\x00\x00\x00\x00\x00\x00'
b'\x00\x00\x00\x00\x00\x00\x01D\x19\x00\x00\x00\x00\x00\xdf\x00'
b'\x00\x01q\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\xff'
b'\xff\xff\xff\xc1\x12\xb9\x04\x96\xa4Z1t\x91\xdfsJ\x90\xf0\x9bh'
b'\x07l&\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
b'\x00\x01D\xf8\x00\x00\x00\x00\x01\x1b\x00\x00\x01\xb8\x00\x00'
b'\x00\x01\x00\x00\x00\x02\x00\x00\x00\x01\xff\xff\xff\xff\x02\n'
b'\x0e\xc6&\xa1\x92\xae6\x0b\x02i\xfe-\xe5\xbao\x05\xd1\xe7\x00'
b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01F'
b'\x13\x00\x00\x00\x00\x01\xec\x00\x00\x03\x06\x00\x00\x00\x01'
b'\x00\x00\x00\x03\x00\x00\x00\x02\xff\xff\xff\xff\x12\xcb\xeby1'
b'\xb6\r\x98B\xcb\x07\xbd`\x8f\x92\xd9\xc4\x84\xbdK\x00\x00\x00'
b'\x00\x00\x00\x00\x00\x00\x00\x00\x00'
)
Georges Racinet
testing: stop skipping all Python tests of Rust revlog...
r53302 from ..revlogutils.constants import (
KIND_CHANGELOG,
)
from .. import revlog
Georges Racinet
rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...
r52132
test: extract some generic data and utility from test-rust-ancestor.py...
r44397
try:
Matt Harbison
typing: disable import error warnings that are already handled...
r47543 from ..cext import parsers as cparsers # pytype: disable=import-error
test: extract some generic data and utility from test-rust-ancestor.py...
r44397 except ImportError:
cparsers = None
Georges Racinet
rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...
r52132 try:
Georges Racinet
testing: stop skipping all Python tests of Rust revlog...
r53302 from ..rustext import ( # pytype: disable=import-error
revlog as rust_revlog,
Georges Racinet on incendie.racinet.fr
rust-index: renamed `MixedIndex` as `Index`...
r52147 )
Georges Racinet
testing: stop skipping all Python tests of Rust revlog...
r53302
rust_revlog.__name__ # force actual import
Georges Racinet
rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...
r52132 except ImportError:
Georges Racinet
testing: stop skipping all Python tests of Rust revlog...
r53302 rust_revlog = None
Georges Racinet
rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...
r52132
test: extract some generic data and utility from test-rust-ancestor.py...
r44397
@unittest.skipIf(
cparsers is None,
'The C version of the "parsers" module is not available. It is needed for this test.',
)
class RevlogBasedTestBase(unittest.TestCase):
Georges Racinet
rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...
r52132 def parseindex(self, data=None):
if data is None:
data = data_non_inlined
return cparsers.parse_index2(data, False)[0]
Georges Racinet on incendie.racinet.fr
rust-python-testing: separated base test classes...
r52137
@unittest.skipIf(
Georges Racinet
testing: stop skipping all Python tests of Rust revlog...
r53302 rust_revlog is None,
'The Rust revlog module is not available. It is needed for this test.',
Georges Racinet on incendie.racinet.fr
rust-python-testing: separated base test classes...
r52137 )
class RustRevlogBasedTestBase(unittest.TestCase):
Georges Racinet
testing: stop skipping all Python tests of Rust revlog...
r53302 # defaults
revlog_data_config = revlog.DataConfig()
revlog_delta_config = revlog.DeltaConfig()
revlog_feature_config = revlog.FeatureConfig()
def make_inner_revlog(
self, data=None, vfs_is_readonly=True, kind=KIND_CHANGELOG
):
Georges Racinet
rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...
r52132 if data is None:
data = data_non_inlined
Georges Racinet
testing: stop skipping all Python tests of Rust revlog...
r53302
return rust_revlog.InnerRevlog(
vfs_base=b"Just a path",
fncache=None, # might be enough for now
vfs_is_readonly=vfs_is_readonly,
index_data=data,
index_file=b'test.i',
data_file=b'test.d',
sidedata_file=None,
inline=False,
data_config=self.revlog_data_config,
delta_config=self.revlog_delta_config,
feature_config=self.revlog_feature_config,
chunk_cache=None,
default_compression_header=None,
revlog_type=kind,
use_persistent_nodemap=False, # until we cook one.
)
def parserustindex(self, data=None):
return revlog.RustIndexProxy(self.make_inner_revlog(data=data))