##// END OF EJS Templates
treemanifest: drop 22nd byte for consistency with manifestdict...
treemanifest: drop 22nd byte for consistency with manifestdict When assigning a 22-byte hash to a nodeid in a manifest, manifestdict drops the 22nd byte, while treemanifest keeps it. Let's make treemanifest drop the 22nd byte as well.

File last commit:

r24466:f310ca66 default
r24467:bfb75405 default
Show More
test-manifest.py
263 lines | 9.3 KiB | text/x-python | PythonLexer
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 import binascii
import unittest
import itertools
import silenttestrunner
Augie Fackler
manifest: split manifestdict into high-level and low-level logic...
r24225 from mercurial import manifest as manifestmod
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 from mercurial import match as matchmod
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214
HASH_1 = '1' * 40
HASH_2 = 'f' * 40
HASH_3 = '1234567890abcdef0987654321deadbeef0fcafe'
A_SHORT_MANIFEST = (
'bar/baz/qux.py\0%(hash2)s%(flag2)s\n'
'foo\0%(hash1)s%(flag1)s\n'
) % {'hash1': HASH_1,
'flag1': '',
'hash2': HASH_2,
'flag2': 'l',
}
HUGE_MANIFEST_ENTRIES = 200001
A_HUGE_MANIFEST = ''.join(sorted(
'file%d\0%s%s\n' % (i, h, f) for i, h, f in
itertools.izip(xrange(200001),
itertools.cycle((HASH_1, HASH_2)),
itertools.cycle(('', 'x', 'l')))))
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 def parsemanifest(text):
return manifestmod.manifestdict(text)
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 class testmanifest(unittest.TestCase):
def assertIn(self, thing, container, msg=None):
# assertIn new in 2.7, use it if available, otherwise polyfill
sup = getattr(unittest.TestCase, 'assertIn', False)
if sup:
return sup(self, thing, container, msg=msg)
if not msg:
msg = 'Expected %r in %r' % (thing, container)
self.assert_(thing in container, msg)
def testEmptyManifest(self):
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 m = parsemanifest('')
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 self.assertEqual(0, len(m))
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 self.assertEqual([], list(m))
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214
def testManifest(self):
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 m = parsemanifest(A_SHORT_MANIFEST)
self.assertEqual(['bar/baz/qux.py', 'foo'], list(m))
self.assertEqual(binascii.unhexlify(HASH_2), m['bar/baz/qux.py'])
self.assertEqual('l', m.flags('bar/baz/qux.py'))
self.assertEqual(binascii.unhexlify(HASH_1), m['foo'])
self.assertEqual('', m.flags('foo'))
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 self.assertRaises(KeyError, lambda : m['wat'])
def testSetItem(self):
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 want = binascii.unhexlify(HASH_1)
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 m = parsemanifest('')
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 m['a'] = want
self.assertIn('a', m)
self.assertEqual(want, m['a'])
self.assertEqual('a\0' + HASH_1 + '\n', m.text())
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 m = parsemanifest(A_SHORT_MANIFEST)
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 m['a'] = want
self.assertEqual(want, m['a'])
self.assertEqual('a\0' + HASH_1 + '\n' + A_SHORT_MANIFEST,
m.text())
Martin von Zweigbergk
test-manifest.py: separate out test for double-free after copy()...
r24465
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 def testSetFlag(self):
want = 'x'
m = parsemanifest('')
# first add a file; a file-less flag makes no sense
m['a'] = binascii.unhexlify(HASH_1)
m.setflag('a', want)
self.assertEqual(want, m.flags('a'))
self.assertEqual('a\0' + HASH_1 + want + '\n', m.text())
m = parsemanifest(A_SHORT_MANIFEST)
# first add a file; a file-less flag makes no sense
m['a'] = binascii.unhexlify(HASH_1)
m.setflag('a', want)
self.assertEqual(want, m.flags('a'))
self.assertEqual('a\0' + HASH_1 + want + '\n' + A_SHORT_MANIFEST,
m.text())
Martin von Zweigbergk
test-manifest.py: separate out test for double-free after copy()...
r24465 def testCopy(self):
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 m = parsemanifest(A_SHORT_MANIFEST)
m['a'] = binascii.unhexlify(HASH_1)
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 m2 = m.copy()
del m
del m2 # make sure we don't double free() anything
def testCompaction(self):
unhex = binascii.unhexlify
h1, h2 = unhex(HASH_1), unhex(HASH_2)
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 m = parsemanifest(A_SHORT_MANIFEST)
m['alpha'] = h1
m['beta'] = h2
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 del m['foo']
want = 'alpha\0%s\nbar/baz/qux.py\0%sl\nbeta\0%s\n' % (
HASH_1, HASH_2, HASH_2)
self.assertEqual(want, m.text())
self.assertEqual(3, len(m))
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 self.assertEqual(['alpha', 'bar/baz/qux.py', 'beta'], list(m))
self.assertEqual(h1, m['alpha'])
self.assertEqual(h2, m['bar/baz/qux.py'])
self.assertEqual(h2, m['beta'])
self.assertEqual('', m.flags('alpha'))
self.assertEqual('l', m.flags('bar/baz/qux.py'))
self.assertEqual('', m.flags('beta'))
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 self.assertRaises(KeyError, lambda : m['foo'])
def testSetGetNodeSuffix(self):
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 clean = parsemanifest(A_SHORT_MANIFEST)
m = parsemanifest(A_SHORT_MANIFEST)
h = m['foo']
f = m.flags('foo')
want = h + 'a'
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 # Merge code wants to set 21-byte fake hashes at times
m['foo'] = want
self.assertEqual(want, m['foo'])
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 self.assertEqual([('bar/baz/qux.py', binascii.unhexlify(HASH_2)),
('foo', binascii.unhexlify(HASH_1) + 'a')],
list(m.iteritems()))
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 # Sometimes it even tries a 22-byte fake hash, but we can
# return 21 and it'll work out
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 m['foo'] = want + '+'
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 self.assertEqual(want, m['foo'])
# make sure the suffix survives a copy
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 match = matchmod.match('', '', ['re:foo'])
m2 = m.matches(match)
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 self.assertEqual(want, m2['foo'])
self.assertEqual(1, len(m2))
self.assertEqual(('foo\0%s\n' % HASH_1), m2.text())
m2 = m.copy()
self.assertEqual(want, m2['foo'])
# suffix with iteration
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 self.assertEqual([('bar/baz/qux.py', binascii.unhexlify(HASH_2)),
('foo', want)],
list(m.iteritems()))
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 # shows up in diff
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 self.assertEqual({'foo': ((want, f), (h, ''))}, m.diff(clean))
self.assertEqual({'foo': ((h, ''), (want, f))}, clean.diff(m))
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 def testMatchException(self):
m = parsemanifest(A_SHORT_MANIFEST)
match = matchmod.match('', '', ['re:.*'])
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 def filt(path):
if path == 'foo':
assert False
return True
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 match.matchfn = filt
self.assertRaises(AssertionError, m.matches, match)
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214
def testRemoveItem(self):
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 m = parsemanifest(A_SHORT_MANIFEST)
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 del m['foo']
self.assertRaises(KeyError, lambda : m['foo'])
self.assertEqual(1, len(m))
self.assertEqual(1, len(list(m)))
Augie Fackler
lazymanifest: use a binary search to do an insertion...
r24228 # now restore and make sure everything works right
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 m['foo'] = 'a' * 20
Augie Fackler
lazymanifest: use a binary search to do an insertion...
r24228 self.assertEqual(2, len(m))
self.assertEqual(2, len(list(m)))
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214
def testManifestDiff(self):
MISSING = (None, '')
addl = 'z-only-in-left\0' + HASH_1 + '\n'
addr = 'z-only-in-right\0' + HASH_2 + 'x\n'
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 left = parsemanifest(
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 A_SHORT_MANIFEST.replace(HASH_1, HASH_3 + 'x') + addl)
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 right = parsemanifest(A_SHORT_MANIFEST + addr)
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 want = {
'foo': ((binascii.unhexlify(HASH_3), 'x'),
(binascii.unhexlify(HASH_1), '')),
'z-only-in-left': ((binascii.unhexlify(HASH_1), ''), MISSING),
'z-only-in-right': (MISSING, (binascii.unhexlify(HASH_2), 'x')),
}
self.assertEqual(want, left.diff(right))
want = {
'bar/baz/qux.py': (MISSING, (binascii.unhexlify(HASH_2), 'l')),
'foo': (MISSING, (binascii.unhexlify(HASH_3), 'x')),
'z-only-in-left': (MISSING, (binascii.unhexlify(HASH_1), '')),
}
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 self.assertEqual(want, parsemanifest('').diff(left))
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214
want = {
'bar/baz/qux.py': ((binascii.unhexlify(HASH_2), 'l'), MISSING),
'foo': ((binascii.unhexlify(HASH_3), 'x'), MISSING),
'z-only-in-left': ((binascii.unhexlify(HASH_1), ''), MISSING),
}
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 self.assertEqual(want, left.diff(parsemanifest('')))
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 copy = right.copy()
del copy['z-only-in-right']
del right['foo']
want = {
'foo': (MISSING, (binascii.unhexlify(HASH_1), '')),
'z-only-in-right': ((binascii.unhexlify(HASH_2), 'x'), MISSING),
}
self.assertEqual(want, right.diff(copy))
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 short = parsemanifest(A_SHORT_MANIFEST)
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 pruned = short.copy()
del pruned['foo']
want = {
'foo': ((binascii.unhexlify(HASH_1), ''), MISSING),
}
self.assertEqual(want, short.diff(pruned))
want = {
'foo': (MISSING, (binascii.unhexlify(HASH_1), '')),
}
self.assertEqual(want, pruned.diff(short))
want = {
'bar/baz/qux.py': None,
'foo': (MISSING, (binascii.unhexlify(HASH_1), '')),
}
self.assertEqual(want, pruned.diff(short, True))
def testReversedLines(self):
backwards = ''.join(
l + '\n' for l in reversed(A_SHORT_MANIFEST.split('\n')) if l)
try:
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 parsemanifest(backwards)
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 self.fail('Should have raised ValueError')
except ValueError, v:
self.assertIn('Manifest lines not in sorted order.', str(v))
def testNoTerminalNewline(self):
try:
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 parsemanifest(A_SHORT_MANIFEST + 'wat')
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 self.fail('Should have raised ValueError')
except ValueError, v:
self.assertIn('Manifest did not end in a newline.', str(v))
def testNoNewLineAtAll(self):
try:
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 parsemanifest('wat')
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 self.fail('Should have raised ValueError')
except ValueError, v:
self.assertIn('Manifest did not end in a newline.', str(v))
def testHugeManifest(self):
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 m = parsemanifest(A_HUGE_MANIFEST)
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214 self.assertEqual(HUGE_MANIFEST_ENTRIES, len(m))
self.assertEqual(len(m), len(list(m)))
Augie Fackler
manifest: split manifestdict into high-level and low-level logic...
r24225 def testIntersectFiles(self):
Martin von Zweigbergk
test-manifest.py: rewrite tests in terms of manifestdict...
r24466 m = parsemanifest(A_HUGE_MANIFEST)
Augie Fackler
manifest: split manifestdict into high-level and low-level logic...
r24225 m2 = m.intersectfiles(['file1', 'file200', 'file300'])
w = ('file1\0%sx\n'
'file200\0%sl\n'
'file300\0%s\n') % (HASH_2, HASH_1, HASH_1)
self.assertEqual(w, m2.text())
Augie Fackler
manifest.c: new extension code to lazily parse manifests...
r24214
if __name__ == '__main__':
silenttestrunner.main(__name__)