Mercurial > hg
annotate tests/test-manifest.py @ 41722:37b33c34bf4f
templatekw: add a {negrev} keyword
Revision numbers are getting much maligned for two reasons: they are
too long in large repos and users get confused by their local-only
nature. It just occurred to me that negative revision numbers avoid
both of those problems. Since negative revision numbers change
whenever the repo changes, it's much more obvious that they are a
local-only convenience. Additionally, for the recent commits that we
usually care about the most, negative revision numbers are always near
zero.
This commit adds a negrev templatekw to more easily expose negative
revision numbers. It's not easy to reliably produce this output with
existing keywords due to hidden commits while at the same time
ensuring good performance.
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Fri, 15 Feb 2019 14:43:31 -0500 |
parents | 0531dff73d0b |
children | 2372284d9457 |
rev | line source |
---|---|
28929
b9ed5a88710c
tests: make test-manifest use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
27637
diff
changeset
|
1 from __future__ import absolute_import |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
2 |
28929
b9ed5a88710c
tests: make test-manifest use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
27637
diff
changeset
|
3 import binascii |
b9ed5a88710c
tests: make test-manifest use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
27637
diff
changeset
|
4 import itertools |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
5 import silenttestrunner |
28929
b9ed5a88710c
tests: make test-manifest use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
27637
diff
changeset
|
6 import unittest |
40599
9eeda7199181
manifest: make sure there's a filename before bothering to look for newline
Augie Fackler <augie@google.com>
parents:
36373
diff
changeset
|
7 import zlib |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
8 |
28929
b9ed5a88710c
tests: make test-manifest use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
27637
diff
changeset
|
9 from mercurial import ( |
b9ed5a88710c
tests: make test-manifest use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
27637
diff
changeset
|
10 manifest as manifestmod, |
b9ed5a88710c
tests: make test-manifest use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
27637
diff
changeset
|
11 match as matchmod, |
b9ed5a88710c
tests: make test-manifest use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
27637
diff
changeset
|
12 ) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
13 |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
14 EMTPY_MANIFEST = b'' |
24569
5491248e148a
test-manifest: create constant for empty manifest
Martin von Zweigbergk <martinvonz@google.com>
parents:
24549
diff
changeset
|
15 |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
16 HASH_1 = b'1' * 40 |
24570
487245cbf1ab
test-manifest: extract constants for binary hashes
Martin von Zweigbergk <martinvonz@google.com>
parents:
24569
diff
changeset
|
17 BIN_HASH_1 = binascii.unhexlify(HASH_1) |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
18 HASH_2 = b'f' * 40 |
24570
487245cbf1ab
test-manifest: extract constants for binary hashes
Martin von Zweigbergk <martinvonz@google.com>
parents:
24569
diff
changeset
|
19 BIN_HASH_2 = binascii.unhexlify(HASH_2) |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
20 HASH_3 = b'1234567890abcdef0987654321deadbeef0fcafe' |
24570
487245cbf1ab
test-manifest: extract constants for binary hashes
Martin von Zweigbergk <martinvonz@google.com>
parents:
24569
diff
changeset
|
21 BIN_HASH_3 = binascii.unhexlify(HASH_3) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
22 A_SHORT_MANIFEST = ( |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
23 b'bar/baz/qux.py\0%(hash2)s%(flag2)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
24 b'foo\0%(hash1)s%(flag1)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
25 ) % {b'hash1': HASH_1, |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
26 b'flag1': b'', |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
27 b'hash2': HASH_2, |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
28 b'flag2': b'l', |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
29 } |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
30 |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
31 A_DEEPER_MANIFEST = ( |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
32 b'a/b/c/bar.py\0%(hash3)s%(flag1)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
33 b'a/b/c/bar.txt\0%(hash1)s%(flag1)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
34 b'a/b/c/foo.py\0%(hash3)s%(flag1)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
35 b'a/b/c/foo.txt\0%(hash2)s%(flag2)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
36 b'a/b/d/baz.py\0%(hash3)s%(flag1)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
37 b'a/b/d/qux.py\0%(hash1)s%(flag2)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
38 b'a/b/d/ten.txt\0%(hash3)s%(flag2)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
39 b'a/b/dog.py\0%(hash3)s%(flag1)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
40 b'a/b/fish.py\0%(hash2)s%(flag1)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
41 b'a/c/london.py\0%(hash3)s%(flag2)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
42 b'a/c/paper.txt\0%(hash2)s%(flag2)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
43 b'a/c/paris.py\0%(hash2)s%(flag1)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
44 b'a/d/apple.py\0%(hash3)s%(flag1)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
45 b'a/d/pizza.py\0%(hash3)s%(flag2)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
46 b'a/green.py\0%(hash1)s%(flag2)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
47 b'a/purple.py\0%(hash2)s%(flag1)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
48 b'app.py\0%(hash3)s%(flag1)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
49 b'readme.txt\0%(hash2)s%(flag1)s\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
50 ) % {b'hash1': HASH_1, |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
51 b'flag1': b'', |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
52 b'hash2': HASH_2, |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
53 b'flag2': b'l', |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
54 b'hash3': HASH_3, |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
55 } |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
56 |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
57 HUGE_MANIFEST_ENTRIES = 200001 |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
58 |
32534
0048a852b6aa
tests: make test-manifest finish importing in Python 3
Augie Fackler <raf@durin42.com>
parents:
32533
diff
changeset
|
59 izip = getattr(itertools, 'izip', zip) |
0048a852b6aa
tests: make test-manifest finish importing in Python 3
Augie Fackler <raf@durin42.com>
parents:
32533
diff
changeset
|
60 if 'xrange' not in globals(): |
0048a852b6aa
tests: make test-manifest finish importing in Python 3
Augie Fackler <raf@durin42.com>
parents:
32533
diff
changeset
|
61 xrange = range |
0048a852b6aa
tests: make test-manifest finish importing in Python 3
Augie Fackler <raf@durin42.com>
parents:
32533
diff
changeset
|
62 |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
63 A_HUGE_MANIFEST = b''.join(sorted( |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
64 b'file%d\0%s%s\n' % (i, h, f) for i, h, f in |
32534
0048a852b6aa
tests: make test-manifest finish importing in Python 3
Augie Fackler <raf@durin42.com>
parents:
32533
diff
changeset
|
65 izip(xrange(200001), |
0048a852b6aa
tests: make test-manifest finish importing in Python 3
Augie Fackler <raf@durin42.com>
parents:
32533
diff
changeset
|
66 itertools.cycle((HASH_1, HASH_2)), |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
67 itertools.cycle((b'', b'x', b'l'))))) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
68 |
24655
528ace39c85c
test-manifest: make manifesttest a base class that is extended
Drew Gottlieb <drgott@google.com>
parents:
24654
diff
changeset
|
69 class basemanifesttests(object): |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
70 def parsemanifest(self, text): |
24655
528ace39c85c
test-manifest: make manifesttest a base class that is extended
Drew Gottlieb <drgott@google.com>
parents:
24654
diff
changeset
|
71 raise NotImplementedError('parsemanifest not implemented by test case') |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
72 |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
73 def testEmptyManifest(self): |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
74 m = self.parsemanifest(EMTPY_MANIFEST) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
75 self.assertEqual(0, len(m)) |
24466
f310ca66a704
test-manifest.py: rewrite tests in terms of manifestdict
Martin von Zweigbergk <martinvonz@google.com>
parents:
24465
diff
changeset
|
76 self.assertEqual([], list(m)) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
77 |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
78 def testManifest(self): |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
79 m = self.parsemanifest(A_SHORT_MANIFEST) |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
80 self.assertEqual([b'bar/baz/qux.py', b'foo'], list(m)) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
81 self.assertEqual(BIN_HASH_2, m[b'bar/baz/qux.py']) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
82 self.assertEqual(b'l', m.flags(b'bar/baz/qux.py')) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
83 self.assertEqual(BIN_HASH_1, m[b'foo']) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
84 self.assertEqual(b'', m.flags(b'foo')) |
32279
68c43a416585
tests: use context manager form of assertRaises
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31876
diff
changeset
|
85 with self.assertRaises(KeyError): |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
86 m[b'wat'] |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
87 |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
88 def testSetItem(self): |
24570
487245cbf1ab
test-manifest: extract constants for binary hashes
Martin von Zweigbergk <martinvonz@google.com>
parents:
24569
diff
changeset
|
89 want = BIN_HASH_1 |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
90 |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
91 m = self.parsemanifest(EMTPY_MANIFEST) |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
92 m[b'a'] = want |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
93 self.assertIn(b'a', m) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
94 self.assertEqual(want, m[b'a']) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
95 self.assertEqual(b'a\0' + HASH_1 + b'\n', m.text()) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
96 |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
97 m = self.parsemanifest(A_SHORT_MANIFEST) |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
98 m[b'a'] = want |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
99 self.assertEqual(want, m[b'a']) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
100 self.assertEqual(b'a\0' + HASH_1 + b'\n' + A_SHORT_MANIFEST, |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
101 m.text()) |
24465
bb8e2b1a0803
test-manifest.py: separate out test for double-free after copy()
Martin von Zweigbergk <martinvonz@google.com>
parents:
24298
diff
changeset
|
102 |
24466
f310ca66a704
test-manifest.py: rewrite tests in terms of manifestdict
Martin von Zweigbergk <martinvonz@google.com>
parents:
24465
diff
changeset
|
103 def testSetFlag(self): |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
104 want = b'x' |
24466
f310ca66a704
test-manifest.py: rewrite tests in terms of manifestdict
Martin von Zweigbergk <martinvonz@google.com>
parents:
24465
diff
changeset
|
105 |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
106 m = self.parsemanifest(EMTPY_MANIFEST) |
24466
f310ca66a704
test-manifest.py: rewrite tests in terms of manifestdict
Martin von Zweigbergk <martinvonz@google.com>
parents:
24465
diff
changeset
|
107 # first add a file; a file-less flag makes no sense |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
108 m[b'a'] = BIN_HASH_1 |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
109 m.setflag(b'a', want) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
110 self.assertEqual(want, m.flags(b'a')) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
111 self.assertEqual(b'a\0' + HASH_1 + want + b'\n', m.text()) |
24466
f310ca66a704
test-manifest.py: rewrite tests in terms of manifestdict
Martin von Zweigbergk <martinvonz@google.com>
parents:
24465
diff
changeset
|
112 |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
113 m = self.parsemanifest(A_SHORT_MANIFEST) |
24466
f310ca66a704
test-manifest.py: rewrite tests in terms of manifestdict
Martin von Zweigbergk <martinvonz@google.com>
parents:
24465
diff
changeset
|
114 # first add a file; a file-less flag makes no sense |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
115 m[b'a'] = BIN_HASH_1 |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
116 m.setflag(b'a', want) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
117 self.assertEqual(want, m.flags(b'a')) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
118 self.assertEqual(b'a\0' + HASH_1 + want + b'\n' + A_SHORT_MANIFEST, |
24466
f310ca66a704
test-manifest.py: rewrite tests in terms of manifestdict
Martin von Zweigbergk <martinvonz@google.com>
parents:
24465
diff
changeset
|
119 m.text()) |
f310ca66a704
test-manifest.py: rewrite tests in terms of manifestdict
Martin von Zweigbergk <martinvonz@google.com>
parents:
24465
diff
changeset
|
120 |
24465
bb8e2b1a0803
test-manifest.py: separate out test for double-free after copy()
Martin von Zweigbergk <martinvonz@google.com>
parents:
24298
diff
changeset
|
121 def testCopy(self): |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
122 m = self.parsemanifest(A_SHORT_MANIFEST) |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
123 m[b'a'] = BIN_HASH_1 |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
124 m2 = m.copy() |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
125 del m |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
126 del m2 # make sure we don't double free() anything |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
127 |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
128 def testCompaction(self): |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
129 unhex = binascii.unhexlify |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
130 h1, h2 = unhex(HASH_1), unhex(HASH_2) |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
131 m = self.parsemanifest(A_SHORT_MANIFEST) |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
132 m[b'alpha'] = h1 |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
133 m[b'beta'] = h2 |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
134 del m[b'foo'] |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
135 want = b'alpha\0%s\nbar/baz/qux.py\0%sl\nbeta\0%s\n' % ( |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
136 HASH_1, HASH_2, HASH_2) |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
137 self.assertEqual(want, m.text()) |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
138 self.assertEqual(3, len(m)) |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
139 self.assertEqual([b'alpha', b'bar/baz/qux.py', b'beta'], list(m)) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
140 self.assertEqual(h1, m[b'alpha']) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
141 self.assertEqual(h2, m[b'bar/baz/qux.py']) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
142 self.assertEqual(h2, m[b'beta']) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
143 self.assertEqual(b'', m.flags(b'alpha')) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
144 self.assertEqual(b'l', m.flags(b'bar/baz/qux.py')) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
145 self.assertEqual(b'', m.flags(b'beta')) |
32279
68c43a416585
tests: use context manager form of assertRaises
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31876
diff
changeset
|
146 with self.assertRaises(KeyError): |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
147 m[b'foo'] |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
148 |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
149 def testSetGetNodeSuffix(self): |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
150 clean = self.parsemanifest(A_SHORT_MANIFEST) |
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
151 m = self.parsemanifest(A_SHORT_MANIFEST) |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
152 h = m[b'foo'] |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
153 f = m.flags(b'foo') |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
154 want = h + b'a' |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
155 # Merge code wants to set 21-byte fake hashes at times |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
156 m[b'foo'] = want |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
157 self.assertEqual(want, m[b'foo']) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
158 self.assertEqual([(b'bar/baz/qux.py', BIN_HASH_2), |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
159 (b'foo', BIN_HASH_1 + b'a')], |
36327
58c1368ab629
py3: use dict.items() instead of dict.iteritems() in tests
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32551
diff
changeset
|
160 list(m.items())) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
161 # Sometimes it even tries a 22-byte fake hash, but we can |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
162 # return 21 and it'll work out |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
163 m[b'foo'] = want + b'+' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
164 self.assertEqual(want, m[b'foo']) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
165 # make sure the suffix survives a copy |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
166 match = matchmod.match(b'', b'', [b're:foo']) |
24466
f310ca66a704
test-manifest.py: rewrite tests in terms of manifestdict
Martin von Zweigbergk <martinvonz@google.com>
parents:
24465
diff
changeset
|
167 m2 = m.matches(match) |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
168 self.assertEqual(want, m2[b'foo']) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
169 self.assertEqual(1, len(m2)) |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
170 m2 = m.copy() |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
171 self.assertEqual(want, m2[b'foo']) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
172 # suffix with iteration |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
173 self.assertEqual([(b'bar/baz/qux.py', BIN_HASH_2), |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
174 (b'foo', want)], |
36327
58c1368ab629
py3: use dict.items() instead of dict.iteritems() in tests
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32551
diff
changeset
|
175 list(m.items())) |
24466
f310ca66a704
test-manifest.py: rewrite tests in terms of manifestdict
Martin von Zweigbergk <martinvonz@google.com>
parents:
24465
diff
changeset
|
176 |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
177 # shows up in diff |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
178 self.assertEqual({b'foo': ((want, f), (h, b''))}, m.diff(clean)) |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
179 self.assertEqual({b'foo': ((h, b''), (want, f))}, clean.diff(m)) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
180 |
24466
f310ca66a704
test-manifest.py: rewrite tests in terms of manifestdict
Martin von Zweigbergk <martinvonz@google.com>
parents:
24465
diff
changeset
|
181 def testMatchException(self): |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
182 m = self.parsemanifest(A_SHORT_MANIFEST) |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
183 match = matchmod.match(b'', b'', [b're:.*']) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
184 def filt(path): |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
185 if path == b'foo': |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
186 assert False |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
187 return True |
24466
f310ca66a704
test-manifest.py: rewrite tests in terms of manifestdict
Martin von Zweigbergk <martinvonz@google.com>
parents:
24465
diff
changeset
|
188 match.matchfn = filt |
32279
68c43a416585
tests: use context manager form of assertRaises
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31876
diff
changeset
|
189 with self.assertRaises(AssertionError): |
68c43a416585
tests: use context manager form of assertRaises
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31876
diff
changeset
|
190 m.matches(match) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
191 |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
192 def testRemoveItem(self): |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
193 m = self.parsemanifest(A_SHORT_MANIFEST) |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
194 del m[b'foo'] |
32279
68c43a416585
tests: use context manager form of assertRaises
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31876
diff
changeset
|
195 with self.assertRaises(KeyError): |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
196 m[b'foo'] |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
197 self.assertEqual(1, len(m)) |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
198 self.assertEqual(1, len(list(m))) |
24228
542c891274b2
lazymanifest: use a binary search to do an insertion
Augie Fackler <augie@google.com>
parents:
24225
diff
changeset
|
199 # now restore and make sure everything works right |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
200 m[b'foo'] = b'a' * 20 |
24228
542c891274b2
lazymanifest: use a binary search to do an insertion
Augie Fackler <augie@google.com>
parents:
24225
diff
changeset
|
201 self.assertEqual(2, len(m)) |
542c891274b2
lazymanifest: use a binary search to do an insertion
Augie Fackler <augie@google.com>
parents:
24225
diff
changeset
|
202 self.assertEqual(2, len(list(m))) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
203 |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
204 def testManifestDiff(self): |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
205 MISSING = (None, b'') |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
206 addl = b'z-only-in-left\0' + HASH_1 + b'\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
207 addr = b'z-only-in-right\0' + HASH_2 + b'x\n' |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
208 left = self.parsemanifest( |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
209 A_SHORT_MANIFEST.replace(HASH_1, HASH_3 + b'x') + addl) |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
210 right = self.parsemanifest(A_SHORT_MANIFEST + addr) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
211 want = { |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
212 b'foo': ((BIN_HASH_3, b'x'), |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
213 (BIN_HASH_1, b'')), |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
214 b'z-only-in-left': ((BIN_HASH_1, b''), MISSING), |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
215 b'z-only-in-right': (MISSING, (BIN_HASH_2, b'x')), |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
216 } |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
217 self.assertEqual(want, left.diff(right)) |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
218 |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
219 want = { |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
220 b'bar/baz/qux.py': (MISSING, (BIN_HASH_2, b'l')), |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
221 b'foo': (MISSING, (BIN_HASH_3, b'x')), |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
222 b'z-only-in-left': (MISSING, (BIN_HASH_1, b'')), |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
223 } |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
224 self.assertEqual(want, self.parsemanifest(EMTPY_MANIFEST).diff(left)) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
225 |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
226 want = { |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
227 b'bar/baz/qux.py': ((BIN_HASH_2, b'l'), MISSING), |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
228 b'foo': ((BIN_HASH_3, b'x'), MISSING), |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
229 b'z-only-in-left': ((BIN_HASH_1, b''), MISSING), |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
230 } |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
231 self.assertEqual(want, left.diff(self.parsemanifest(EMTPY_MANIFEST))) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
232 copy = right.copy() |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
233 del copy[b'z-only-in-right'] |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
234 del right[b'foo'] |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
235 want = { |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
236 b'foo': (MISSING, (BIN_HASH_1, b'')), |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
237 b'z-only-in-right': ((BIN_HASH_2, b'x'), MISSING), |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
238 } |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
239 self.assertEqual(want, right.diff(copy)) |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
240 |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
241 short = self.parsemanifest(A_SHORT_MANIFEST) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
242 pruned = short.copy() |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
243 del pruned[b'foo'] |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
244 want = { |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
245 b'foo': ((BIN_HASH_1, b''), MISSING), |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
246 } |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
247 self.assertEqual(want, short.diff(pruned)) |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
248 want = { |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
249 b'foo': (MISSING, (BIN_HASH_1, b'')), |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
250 } |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
251 self.assertEqual(want, pruned.diff(short)) |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
252 want = { |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
253 b'bar/baz/qux.py': None, |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
254 b'foo': (MISSING, (BIN_HASH_1, b'')), |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
255 } |
31255
959ebff3505a
manifest: add match argument to diff and filesnotin
Durham Goode <durham@fb.com>
parents:
28929
diff
changeset
|
256 self.assertEqual(want, pruned.diff(short, clean=True)) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
257 |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
258 def testReversedLines(self): |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
259 backwards = b''.join( |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
260 l + b'\n' for l in reversed(A_SHORT_MANIFEST.split(b'\n')) if l) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
261 try: |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
262 self.parsemanifest(backwards) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
263 self.fail('Should have raised ValueError') |
25660
328739ea70c3
global: mass rewrite to use modern exception syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents:
24656
diff
changeset
|
264 except ValueError as v: |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
265 self.assertIn('Manifest lines not in sorted order.', str(v)) |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
266 |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
267 def testNoTerminalNewline(self): |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
268 try: |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
269 self.parsemanifest(A_SHORT_MANIFEST + b'wat') |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
270 self.fail('Should have raised ValueError') |
25660
328739ea70c3
global: mass rewrite to use modern exception syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents:
24656
diff
changeset
|
271 except ValueError as v: |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
272 self.assertIn('Manifest did not end in a newline.', str(v)) |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
273 |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
274 def testNoNewLineAtAll(self): |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
275 try: |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
276 self.parsemanifest(b'wat') |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
277 self.fail('Should have raised ValueError') |
25660
328739ea70c3
global: mass rewrite to use modern exception syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents:
24656
diff
changeset
|
278 except ValueError as v: |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
279 self.assertIn('Manifest did not end in a newline.', str(v)) |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
280 |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
281 def testHugeManifest(self): |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
282 m = self.parsemanifest(A_HUGE_MANIFEST) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
283 self.assertEqual(HUGE_MANIFEST_ENTRIES, len(m)) |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
284 self.assertEqual(len(m), len(list(m))) |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
285 |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
286 def testMatchesMetadata(self): |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
287 '''Tests matches() for a few specific files to make sure that both |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
288 the set of files as well as their flags and nodeids are correct in |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
289 the resulting manifest.''' |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
290 m = self.parsemanifest(A_HUGE_MANIFEST) |
24495
d2a3a2808974
manifest: make manifest.intersectfiles() internal
Drew Gottlieb <drgott@google.com>
parents:
24468
diff
changeset
|
291 |
41676
0531dff73d0b
match: delete unused root and cwd arguments from {always,never,exact}() (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
41621
diff
changeset
|
292 match = matchmod.exact([b'file1', b'file200', b'file300']) |
24495
d2a3a2808974
manifest: make manifest.intersectfiles() internal
Drew Gottlieb <drgott@google.com>
parents:
24468
diff
changeset
|
293 m2 = m.matches(match) |
d2a3a2808974
manifest: make manifest.intersectfiles() internal
Drew Gottlieb <drgott@google.com>
parents:
24468
diff
changeset
|
294 |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
295 w = (b'file1\0%sx\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
296 b'file200\0%sl\n' |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
297 b'file300\0%s\n') % (HASH_2, HASH_1, HASH_1) |
24225
3e5c4af69808
manifest: split manifestdict into high-level and low-level logic
Augie Fackler <augie@google.com>
parents:
24214
diff
changeset
|
298 self.assertEqual(w, m2.text()) |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
299 |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
300 def testMatchesNonexistentFile(self): |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
301 '''Tests matches() for a small set of specific files, including one |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
302 nonexistent file to make sure in only matches against existing files. |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
303 ''' |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
304 m = self.parsemanifest(A_DEEPER_MANIFEST) |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
305 |
41676
0531dff73d0b
match: delete unused root and cwd arguments from {always,never,exact}() (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
41621
diff
changeset
|
306 match = matchmod.exact([b'a/b/c/bar.txt', b'a/b/d/qux.py', |
0531dff73d0b
match: delete unused root and cwd arguments from {always,never,exact}() (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
41621
diff
changeset
|
307 b'readme.txt', b'nonexistent']) |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
308 m2 = m.matches(match) |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
309 |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
310 self.assertEqual( |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
311 [b'a/b/c/bar.txt', b'a/b/d/qux.py', b'readme.txt'], |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
312 m2.keys()) |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
313 |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
314 def testMatchesNonexistentDirectory(self): |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
315 '''Tests matches() for a relpath match on a directory that doesn't |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
316 actually exist.''' |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
317 m = self.parsemanifest(A_DEEPER_MANIFEST) |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
318 |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
319 match = matchmod.match(b'/', b'', [b'a/f'], default=b'relpath') |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
320 m2 = m.matches(match) |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
321 |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
322 self.assertEqual([], m2.keys()) |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
323 |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
324 def testMatchesExactLarge(self): |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
325 '''Tests matches() for files matching a large list of exact files. |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
326 ''' |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
327 m = self.parsemanifest(A_HUGE_MANIFEST) |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
328 |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
329 flist = m.keys()[80:300] |
41676
0531dff73d0b
match: delete unused root and cwd arguments from {always,never,exact}() (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
41621
diff
changeset
|
330 match = matchmod.exact(flist) |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
331 m2 = m.matches(match) |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
332 |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
333 self.assertEqual(flist, m2.keys()) |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
334 |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
335 def testMatchesFull(self): |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
336 '''Tests matches() for what should be a full match.''' |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
337 m = self.parsemanifest(A_DEEPER_MANIFEST) |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
338 |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
339 match = matchmod.match(b'/', b'', [b'']) |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
340 m2 = m.matches(match) |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
341 |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
342 self.assertEqual(m.keys(), m2.keys()) |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
343 |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
344 def testMatchesDirectory(self): |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
345 '''Tests matches() on a relpath match on a directory, which should |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
346 match against all files within said directory.''' |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
347 m = self.parsemanifest(A_DEEPER_MANIFEST) |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
348 |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
349 match = matchmod.match(b'/', b'', [b'a/b'], default=b'relpath') |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
350 m2 = m.matches(match) |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
351 |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
352 self.assertEqual([ |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
353 b'a/b/c/bar.py', b'a/b/c/bar.txt', b'a/b/c/foo.py', |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
354 b'a/b/c/foo.txt', |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
355 b'a/b/d/baz.py', b'a/b/d/qux.py', b'a/b/d/ten.txt', b'a/b/dog.py', |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
356 b'a/b/fish.py'], m2.keys()) |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
357 |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
358 def testMatchesExactPath(self): |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
359 '''Tests matches() on an exact match on a directory, which should |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
360 result in an empty manifest because you can't perform an exact match |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
361 against a directory.''' |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
362 m = self.parsemanifest(A_DEEPER_MANIFEST) |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
363 |
41676
0531dff73d0b
match: delete unused root and cwd arguments from {always,never,exact}() (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
41621
diff
changeset
|
364 match = matchmod.exact([b'a/b']) |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
365 m2 = m.matches(match) |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
366 |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
367 self.assertEqual([], m2.keys()) |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
368 |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
369 def testMatchesCwd(self): |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
370 '''Tests matches() on a relpath match with the current directory ('.') |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
371 when not in the root directory.''' |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
372 m = self.parsemanifest(A_DEEPER_MANIFEST) |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
373 |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
374 match = matchmod.match(b'/', b'a/b', [b'.'], default=b'relpath') |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
375 m2 = m.matches(match) |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
376 |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
377 self.assertEqual([ |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
378 b'a/b/c/bar.py', b'a/b/c/bar.txt', b'a/b/c/foo.py', |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
379 b'a/b/c/foo.txt', b'a/b/d/baz.py', b'a/b/d/qux.py', |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
380 b'a/b/d/ten.txt', b'a/b/dog.py', b'a/b/fish.py'], m2.keys()) |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
381 |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
382 def testMatchesWithPattern(self): |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
383 '''Tests matches() for files matching a pattern that reside |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
384 deeper than the specified directory.''' |
24654
9d6db63ccf00
test-manifest: move parsemanifest() to be a testmanifest class method
Drew Gottlieb <drgott@google.com>
parents:
24573
diff
changeset
|
385 m = self.parsemanifest(A_DEEPER_MANIFEST) |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
386 |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
387 match = matchmod.match(b'/', b'', [b'a/b/*/*.txt']) |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
388 m2 = m.matches(match) |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
389 |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
390 self.assertEqual( |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
391 [b'a/b/c/bar.txt', b'a/b/c/foo.txt', b'a/b/d/ten.txt'], |
24549
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
392 m2.keys()) |
bcf0de51326e
manifest: add some tests for manifest.matches()
Drew Gottlieb <drgott@google.com>
parents:
24495
diff
changeset
|
393 |
24655
528ace39c85c
test-manifest: make manifesttest a base class that is extended
Drew Gottlieb <drgott@google.com>
parents:
24654
diff
changeset
|
394 class testmanifestdict(unittest.TestCase, basemanifesttests): |
528ace39c85c
test-manifest: make manifesttest a base class that is extended
Drew Gottlieb <drgott@google.com>
parents:
24654
diff
changeset
|
395 def parsemanifest(self, text): |
528ace39c85c
test-manifest: make manifesttest a base class that is extended
Drew Gottlieb <drgott@google.com>
parents:
24654
diff
changeset
|
396 return manifestmod.manifestdict(text) |
528ace39c85c
test-manifest: make manifesttest a base class that is extended
Drew Gottlieb <drgott@google.com>
parents:
24654
diff
changeset
|
397 |
40599
9eeda7199181
manifest: make sure there's a filename before bothering to look for newline
Augie Fackler <augie@google.com>
parents:
36373
diff
changeset
|
398 def testObviouslyBogusManifest(self): |
9eeda7199181
manifest: make sure there's a filename before bothering to look for newline
Augie Fackler <augie@google.com>
parents:
36373
diff
changeset
|
399 # This is a 163k manifest that came from oss-fuzz. It was a |
9eeda7199181
manifest: make sure there's a filename before bothering to look for newline
Augie Fackler <augie@google.com>
parents:
36373
diff
changeset
|
400 # timeout there, but when run normally it doesn't seem to |
9eeda7199181
manifest: make sure there's a filename before bothering to look for newline
Augie Fackler <augie@google.com>
parents:
36373
diff
changeset
|
401 # present any particular slowness. |
9eeda7199181
manifest: make sure there's a filename before bothering to look for newline
Augie Fackler <augie@google.com>
parents:
36373
diff
changeset
|
402 data = zlib.decompress( |
40629
ab59cc71f80c
tests: fix bytes/str issue I introduced when adding this test
Augie Fackler <augie@google.com>
parents:
40599
diff
changeset
|
403 b'x\x9c\xed\xce;\n\x83\x00\x10\x04\xd0\x8deNa\x93~\xf1\x03\xc9q\xf4' |
ab59cc71f80c
tests: fix bytes/str issue I introduced when adding this test
Augie Fackler <augie@google.com>
parents:
40599
diff
changeset
|
404 b'\x14\xeaU\xbdB\xda\xd4\xe6Cj\xc1FA\xde+\x86\xe9f\xa2\xfci\xbb\xfb' |
ab59cc71f80c
tests: fix bytes/str issue I introduced when adding this test
Augie Fackler <augie@google.com>
parents:
40599
diff
changeset
|
405 b'\xa3\xef\xea\xba\xca\x7fk\x86q\x9a\xc6\xc8\xcc&\xb3\xcf\xf8\xb8|#' |
ab59cc71f80c
tests: fix bytes/str issue I introduced when adding this test
Augie Fackler <augie@google.com>
parents:
40599
diff
changeset
|
406 b'\x8a9\x00\xd8\xe6v\xf4\x01N\xe1\n\x00\x00\x00\x00\x00\x00\x00\x00' |
ab59cc71f80c
tests: fix bytes/str issue I introduced when adding this test
Augie Fackler <augie@google.com>
parents:
40599
diff
changeset
|
407 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' |
ab59cc71f80c
tests: fix bytes/str issue I introduced when adding this test
Augie Fackler <augie@google.com>
parents:
40599
diff
changeset
|
408 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' |
ab59cc71f80c
tests: fix bytes/str issue I introduced when adding this test
Augie Fackler <augie@google.com>
parents:
40599
diff
changeset
|
409 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' |
ab59cc71f80c
tests: fix bytes/str issue I introduced when adding this test
Augie Fackler <augie@google.com>
parents:
40599
diff
changeset
|
410 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' |
ab59cc71f80c
tests: fix bytes/str issue I introduced when adding this test
Augie Fackler <augie@google.com>
parents:
40599
diff
changeset
|
411 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' |
ab59cc71f80c
tests: fix bytes/str issue I introduced when adding this test
Augie Fackler <augie@google.com>
parents:
40599
diff
changeset
|
412 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' |
ab59cc71f80c
tests: fix bytes/str issue I introduced when adding this test
Augie Fackler <augie@google.com>
parents:
40599
diff
changeset
|
413 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' |
ab59cc71f80c
tests: fix bytes/str issue I introduced when adding this test
Augie Fackler <augie@google.com>
parents:
40599
diff
changeset
|
414 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' |
ab59cc71f80c
tests: fix bytes/str issue I introduced when adding this test
Augie Fackler <augie@google.com>
parents:
40599
diff
changeset
|
415 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' |
ab59cc71f80c
tests: fix bytes/str issue I introduced when adding this test
Augie Fackler <augie@google.com>
parents:
40599
diff
changeset
|
416 b'\x00\x00\xc0\x8aey\x1d}\x01\xd8\xe0\xb9\xf3\xde\x1b\xcf\x17' |
ab59cc71f80c
tests: fix bytes/str issue I introduced when adding this test
Augie Fackler <augie@google.com>
parents:
40599
diff
changeset
|
417 b'\xac\xbe') |
40599
9eeda7199181
manifest: make sure there's a filename before bothering to look for newline
Augie Fackler <augie@google.com>
parents:
36373
diff
changeset
|
418 with self.assertRaises(ValueError): |
9eeda7199181
manifest: make sure there's a filename before bothering to look for newline
Augie Fackler <augie@google.com>
parents:
36373
diff
changeset
|
419 self.parsemanifest(data) |
9eeda7199181
manifest: make sure there's a filename before bothering to look for newline
Augie Fackler <augie@google.com>
parents:
36373
diff
changeset
|
420 |
24656
29c238e4a58a
test-manifest: add some test coverage for treemanifest
Drew Gottlieb <drgott@google.com>
parents:
24655
diff
changeset
|
421 class testtreemanifest(unittest.TestCase, basemanifesttests): |
29c238e4a58a
test-manifest: add some test coverage for treemanifest
Drew Gottlieb <drgott@google.com>
parents:
24655
diff
changeset
|
422 def parsemanifest(self, text): |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
423 return manifestmod.treemanifest(b'', text) |
24656
29c238e4a58a
test-manifest: add some test coverage for treemanifest
Drew Gottlieb <drgott@google.com>
parents:
24655
diff
changeset
|
424 |
31876
94c1d3c1aea2
treemanifest: add walksubtrees api
Durham Goode <durham@fb.com>
parents:
31255
diff
changeset
|
425 def testWalkSubtrees(self): |
94c1d3c1aea2
treemanifest: add walksubtrees api
Durham Goode <durham@fb.com>
parents:
31255
diff
changeset
|
426 m = self.parsemanifest(A_DEEPER_MANIFEST) |
94c1d3c1aea2
treemanifest: add walksubtrees api
Durham Goode <durham@fb.com>
parents:
31255
diff
changeset
|
427 |
94c1d3c1aea2
treemanifest: add walksubtrees api
Durham Goode <durham@fb.com>
parents:
31255
diff
changeset
|
428 dirs = [s._dir for s in m.walksubtrees()] |
94c1d3c1aea2
treemanifest: add walksubtrees api
Durham Goode <durham@fb.com>
parents:
31255
diff
changeset
|
429 self.assertEqual( |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
430 sorted([ |
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
431 b'', b'a/', b'a/c/', b'a/d/', b'a/b/', b'a/b/c/', b'a/b/d/']), |
31876
94c1d3c1aea2
treemanifest: add walksubtrees api
Durham Goode <durham@fb.com>
parents:
31255
diff
changeset
|
432 sorted(dirs) |
94c1d3c1aea2
treemanifest: add walksubtrees api
Durham Goode <durham@fb.com>
parents:
31255
diff
changeset
|
433 ) |
94c1d3c1aea2
treemanifest: add walksubtrees api
Durham Goode <durham@fb.com>
parents:
31255
diff
changeset
|
434 |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
435 match = matchmod.match(b'/', b'', [b'path:a/b/']) |
31876
94c1d3c1aea2
treemanifest: add walksubtrees api
Durham Goode <durham@fb.com>
parents:
31255
diff
changeset
|
436 dirs = [s._dir for s in m.walksubtrees(matcher=match)] |
94c1d3c1aea2
treemanifest: add walksubtrees api
Durham Goode <durham@fb.com>
parents:
31255
diff
changeset
|
437 self.assertEqual( |
32551
0ff336a42c39
tests: make test-manifest.py portable to Python 3
Augie Fackler <raf@durin42.com>
parents:
32534
diff
changeset
|
438 sorted([b'a/b/', b'a/b/c/', b'a/b/d/']), |
31876
94c1d3c1aea2
treemanifest: add walksubtrees api
Durham Goode <durham@fb.com>
parents:
31255
diff
changeset
|
439 sorted(dirs) |
94c1d3c1aea2
treemanifest: add walksubtrees api
Durham Goode <durham@fb.com>
parents:
31255
diff
changeset
|
440 ) |
94c1d3c1aea2
treemanifest: add walksubtrees api
Durham Goode <durham@fb.com>
parents:
31255
diff
changeset
|
441 |
24214
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
442 if __name__ == '__main__': |
a5f1bccd2996
manifest.c: new extension code to lazily parse manifests
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
443 silenttestrunner.main(__name__) |