This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5116

testing: switch to inserting deltas
ClosedPublic

Authored by indygreg on Oct 16 2018, 11:54 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2c0aa02ecd5a: testing: switch to inserting deltas
Summary

As the comment in the test specifies, this was relying on storage backend
implementation details. We switch to inserting a raw delta, skipping the
regular insert path to ensure we have the desired outcome. This required
implementing support for handling deltas in the revlog testing code.

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

indygreg created this revision.Oct 16 2018, 11:54 AM
Closed by commit rHG2c0aa02ecd5a: testing: switch to inserting deltas (authored by indygreg). · Explain WhyOct 16 2018, 1:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/testing/storage.py (7 lines)
Mtests/test-storage.py (3 lines)

Diff 12172

mercurial/testing/storage.py

node1 = b'\xaa' * 20 node1 = b'\xaa' * 20
self._addrawrevisionfn(f, tr, node1, node0, nullid, 1, self._addrawrevisionfn(f, tr, node1, node0, nullid, 1,
rawtext=fulltext1) rawtext=fulltext1)
with self.assertRaises(error.StorageError): with self.assertRaises(error.StorageError):
f.read(node1) f.read(node1)
diff = mdiff.textdiff(fulltext1, fulltext2)
node2 = storageutil.hashrevisionsha1(fulltext2, node1, nullid) node2 = storageutil.hashrevisionsha1(fulltext2, node1, nullid)
deltas = [(node2, node1, nullid, b'\x01' * 20, node1, diff, 0)]
# This /might/ fail on some backends.
with self._maketransactionfn() as tr: with self._maketransactionfn() as tr:
f.addgroup(deltas, lambda x: 0, tr) delta = mdiff.textdiff(fulltext1, fulltext2)
self._addrawrevisionfn(f, tr, node2, node1, nullid,
2, delta=(1, delta))
self.assertEqual(len(f), 3) self.assertEqual(len(f), 3)
# Assuming a delta is stored, we shouldn't need to validate node1 in # Assuming a delta is stored, we shouldn't need to validate node1 in
# order to retrieve node2. # order to retrieve node2.
self.assertEqual(f.read(node2), fulltext2) self.assertEqual(f.read(node2), fulltext2)
def testcensored(self): def testcensored(self):

tests/test-storage.py

if ellipsis: if ellipsis:
flags |= revlog.REVIDX_ELLIPSIS flags |= revlog.REVIDX_ELLIPSIS
if extstored: if extstored:
flags |= revlog.REVIDX_EXTSTORED flags |= revlog.REVIDX_EXTSTORED
if rawtext is not None: if rawtext is not None:
fl._revlog.addrawrevision(rawtext, tr, linkrev, p1, p2, node, flags) fl._revlog.addrawrevision(rawtext, tr, linkrev, p1, p2, node, flags)
elif delta is not None: elif delta is not None:
raise error.Abort('support for storing raw deltas not yet supported') fl._revlog.addrawrevision(rawtext, tr, linkrev, p1, p2, node, flags,
cachedelta=delta)
else: else:
raise error.Abort('must supply rawtext or delta arguments') raise error.Abort('must supply rawtext or delta arguments')
# We may insert bad data. Clear caches to prevent e.g. cache hits to # We may insert bad data. Clear caches to prevent e.g. cache hits to
# bypass hash verification. # bypass hash verification.
fl._revlog.clearcaches() fl._revlog.clearcaches()
# Assigning module-level attributes that inherit from unittest.TestCase # Assigning module-level attributes that inherit from unittest.TestCase