/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test__chk_map.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2009, 2010, 2011 Canonical Ltd
 
1
# Copyright (C) 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
"""Tests for _chk_map_*."""
18
18
 
19
 
from .. import (
 
19
from bzrlib import (
 
20
    chk_map,
20
21
    tests,
21
22
    )
22
 
from ..bzr import (
23
 
    chk_map,
24
 
    )
25
 
from ..sixish import int2byte
26
 
from ..static_tuple import StaticTuple
 
23
from bzrlib.static_tuple import StaticTuple
27
24
stuple = StaticTuple
28
25
 
29
26
 
30
 
def load_tests(loader, standard_tests, pattern):
 
27
def load_tests(standard_tests, module, loader):
31
28
    suite, _ = tests.permute_tests_for_extension(standard_tests, loader,
32
 
                                                 'breezy.bzr._chk_map_py', 'breezy.bzr._chk_map_pyx')
 
29
        'bzrlib._chk_map_py', 'bzrlib._chk_map_pyx')
33
30
    return suite
34
31
 
35
32
 
36
33
class TestSearchKeys(tests.TestCase):
37
34
 
38
 
    module = None  # Filled in by test parameterization
 
35
    module = None # Filled in by test parameterization
39
36
 
40
37
    def assertSearchKey16(self, expected, key):
41
38
        self.assertEqual(expected, self.module._search_key_16(key))
45
42
        self.assertEqual(expected, actual, 'actual: %r' % (actual,))
46
43
 
47
44
    def test_simple_16(self):
48
 
        self.assertSearchKey16(b'8C736521', stuple(b'foo',))
49
 
        self.assertSearchKey16(b'8C736521\x008C736521', stuple(b'foo', b'foo'))
50
 
        self.assertSearchKey16(b'8C736521\x0076FF8CAA', stuple(b'foo', b'bar'))
51
 
        self.assertSearchKey16(b'ED82CD11', stuple(b'abcd',))
 
45
        self.assertSearchKey16('8C736521', stuple('foo',))
 
46
        self.assertSearchKey16('8C736521\x008C736521', stuple('foo', 'foo'))
 
47
        self.assertSearchKey16('8C736521\x0076FF8CAA', stuple('foo', 'bar'))
 
48
        self.assertSearchKey16('ED82CD11', stuple('abcd',))
52
49
 
53
50
    def test_simple_255(self):
54
 
        self.assertSearchKey255(b'\x8cse!', stuple(b'foo',))
55
 
        self.assertSearchKey255(b'\x8cse!\x00\x8cse!', stuple(b'foo', b'foo'))
56
 
        self.assertSearchKey255(
57
 
            b'\x8cse!\x00v\xff\x8c\xaa', stuple(b'foo', b'bar'))
 
51
        self.assertSearchKey255('\x8cse!', stuple('foo',))
 
52
        self.assertSearchKey255('\x8cse!\x00\x8cse!', stuple('foo', 'foo'))
 
53
        self.assertSearchKey255('\x8cse!\x00v\xff\x8c\xaa', stuple('foo', 'bar'))
58
54
        # The standard mapping for these would include '\n', so it should be
59
55
        # mapped to '_'
60
 
        self.assertSearchKey255(b'\xfdm\x93_\x00P_\x1bL', stuple(b'<', b'V'))
 
56
        self.assertSearchKey255('\xfdm\x93_\x00P_\x1bL', stuple('<', 'V'))
61
57
 
62
58
    def test_255_does_not_include_newline(self):
63
59
        # When mapping via _search_key_255, we should never have the '\n'
64
60
        # character, but all other 255 values should be present
65
61
        chars_used = set()
66
62
        for char_in in range(256):
67
 
            search_key = self.module._search_key_255(
68
 
                stuple(int2byte(char_in),))
69
 
            chars_used.update(map(int2byte, bytearray(search_key)))
70
 
        all_chars = {int2byte(x) for x in range(256)}
 
63
            search_key = self.module._search_key_255(stuple(chr(char_in),))
 
64
            chars_used.update(search_key)
 
65
        all_chars = set([chr(x) for x in range(256)])
71
66
        unused_chars = all_chars.symmetric_difference(chars_used)
72
 
        self.assertEqual({b'\n'}, unused_chars)
 
67
        self.assertEqual(set('\n'), unused_chars)
73
68
 
74
69
 
75
70
class TestDeserialiseLeafNode(tests.TestCase):
78
73
 
79
74
    def assertDeserialiseErrors(self, text):
80
75
        self.assertRaises((ValueError, IndexError),
81
 
                          self.module._deserialise_leaf_node, text, b'not-a-real-sha')
 
76
            self.module._deserialise_leaf_node, text, 'not-a-real-sha')
82
77
 
83
78
    def test_raises_on_non_leaf(self):
84
 
        self.assertDeserialiseErrors(b'')
85
 
        self.assertDeserialiseErrors(b'short\n')
86
 
        self.assertDeserialiseErrors(b'chknotleaf:\n')
87
 
        self.assertDeserialiseErrors(b'chkleaf:x\n')
88
 
        self.assertDeserialiseErrors(b'chkleaf:\n')
89
 
        self.assertDeserialiseErrors(b'chkleaf:\nnotint\n')
90
 
        self.assertDeserialiseErrors(b'chkleaf:\n10\n')
91
 
        self.assertDeserialiseErrors(b'chkleaf:\n10\n256\n')
92
 
        self.assertDeserialiseErrors(b'chkleaf:\n10\n256\n10\n')
 
79
        self.assertDeserialiseErrors('')
 
80
        self.assertDeserialiseErrors('short\n')
 
81
        self.assertDeserialiseErrors('chknotleaf:\n')
 
82
        self.assertDeserialiseErrors('chkleaf:x\n')
 
83
        self.assertDeserialiseErrors('chkleaf:\n')
 
84
        self.assertDeserialiseErrors('chkleaf:\nnotint\n')
 
85
        self.assertDeserialiseErrors('chkleaf:\n10\n')
 
86
        self.assertDeserialiseErrors('chkleaf:\n10\n256\n')
 
87
        self.assertDeserialiseErrors('chkleaf:\n10\n256\n10\n')
93
88
 
94
89
    def test_deserialise_empty(self):
95
90
        node = self.module._deserialise_leaf_node(
96
 
            b"chkleaf:\n10\n1\n0\n\n", stuple(b"sha1:1234",))
 
91
            "chkleaf:\n10\n1\n0\n\n", stuple("sha1:1234",))
97
92
        self.assertEqual(0, len(node))
98
93
        self.assertEqual(10, node.maximum_size)
99
 
        self.assertEqual((b"sha1:1234",), node.key())
 
94
        self.assertEqual(("sha1:1234",), node.key())
100
95
        self.assertIsInstance(node.key(), StaticTuple)
101
96
        self.assertIs(None, node._search_prefix)
102
97
        self.assertIs(None, node._common_serialised_prefix)
103
98
 
104
99
    def test_deserialise_items(self):
105
100
        node = self.module._deserialise_leaf_node(
106
 
            b"chkleaf:\n0\n1\n2\n\nfoo bar\x001\nbaz\nquux\x001\nblarh\n",
107
 
            (b"sha1:1234",))
 
101
            "chkleaf:\n0\n1\n2\n\nfoo bar\x001\nbaz\nquux\x001\nblarh\n",
 
102
            ("sha1:1234",))
108
103
        self.assertEqual(2, len(node))
109
 
        self.assertEqual([((b"foo bar",), b"baz"), ((b"quux",), b"blarh")],
110
 
                         sorted(node.iteritems(None)))
 
104
        self.assertEqual([(("foo bar",), "baz"), (("quux",), "blarh")],
 
105
            sorted(node.iteritems(None)))
111
106
 
112
107
    def test_deserialise_item_with_null_width_1(self):
113
108
        node = self.module._deserialise_leaf_node(
114
 
            b"chkleaf:\n0\n1\n2\n\nfoo\x001\nbar\x00baz\nquux\x001\nblarh\n",
115
 
            (b"sha1:1234",))
 
109
            "chkleaf:\n0\n1\n2\n\nfoo\x001\nbar\x00baz\nquux\x001\nblarh\n",
 
110
            ("sha1:1234",))
116
111
        self.assertEqual(2, len(node))
117
 
        self.assertEqual([((b"foo",), b"bar\x00baz"), ((b"quux",), b"blarh")],
118
 
                         sorted(node.iteritems(None)))
 
112
        self.assertEqual([(("foo",), "bar\x00baz"), (("quux",), "blarh")],
 
113
            sorted(node.iteritems(None)))
119
114
 
120
115
    def test_deserialise_item_with_null_width_2(self):
121
116
        node = self.module._deserialise_leaf_node(
122
 
            b"chkleaf:\n0\n2\n2\n\nfoo\x001\x001\nbar\x00baz\n"
123
 
            b"quux\x00\x001\nblarh\n",
124
 
            (b"sha1:1234",))
 
117
            "chkleaf:\n0\n2\n2\n\nfoo\x001\x001\nbar\x00baz\n"
 
118
            "quux\x00\x001\nblarh\n",
 
119
            ("sha1:1234",))
125
120
        self.assertEqual(2, len(node))
126
 
        self.assertEqual([((b"foo", b"1"), b"bar\x00baz"), ((b"quux", b""), b"blarh")],
127
 
                         sorted(node.iteritems(None)))
 
121
        self.assertEqual([(("foo", "1"), "bar\x00baz"), (("quux", ""), "blarh")],
 
122
            sorted(node.iteritems(None)))
128
123
 
129
124
    def test_iteritems_selected_one_of_two_items(self):
130
125
        node = self.module._deserialise_leaf_node(
131
 
            b"chkleaf:\n0\n1\n2\n\nfoo bar\x001\nbaz\nquux\x001\nblarh\n",
132
 
            (b"sha1:1234",))
 
126
            "chkleaf:\n0\n1\n2\n\nfoo bar\x001\nbaz\nquux\x001\nblarh\n",
 
127
            ("sha1:1234",))
133
128
        self.assertEqual(2, len(node))
134
 
        self.assertEqual([((b"quux",), b"blarh")],
135
 
                         sorted(node.iteritems(None, [(b"quux",), (b"qaz",)])))
 
129
        self.assertEqual([(("quux",), "blarh")],
 
130
            sorted(node.iteritems(None, [("quux",), ("qaz",)])))
136
131
 
137
132
    def test_deserialise_item_with_common_prefix(self):
138
133
        node = self.module._deserialise_leaf_node(
139
 
            b"chkleaf:\n0\n2\n2\nfoo\x00\n1\x001\nbar\x00baz\n2\x001\nblarh\n",
140
 
            (b"sha1:1234",))
 
134
            "chkleaf:\n0\n2\n2\nfoo\x00\n1\x001\nbar\x00baz\n2\x001\nblarh\n",
 
135
            ("sha1:1234",))
141
136
        self.assertEqual(2, len(node))
142
 
        self.assertEqual([((b"foo", b"1"), b"bar\x00baz"), ((b"foo", b"2"), b"blarh")],
143
 
                         sorted(node.iteritems(None)))
 
137
        self.assertEqual([(("foo", "1"), "bar\x00baz"), (("foo", "2"), "blarh")],
 
138
            sorted(node.iteritems(None)))
144
139
        self.assertIs(chk_map._unknown, node._search_prefix)
145
 
        self.assertEqual(b'foo\x00', node._common_serialised_prefix)
 
140
        self.assertEqual('foo\x00', node._common_serialised_prefix)
146
141
 
147
142
    def test_deserialise_multi_line(self):
148
143
        node = self.module._deserialise_leaf_node(
149
 
            b"chkleaf:\n0\n2\n2\nfoo\x00\n1\x002\nbar\nbaz\n2\x002\nblarh\n\n",
150
 
            (b"sha1:1234",))
 
144
            "chkleaf:\n0\n2\n2\nfoo\x00\n1\x002\nbar\nbaz\n2\x002\nblarh\n\n",
 
145
            ("sha1:1234",))
151
146
        self.assertEqual(2, len(node))
152
 
        self.assertEqual([((b"foo", b"1"), b"bar\nbaz"),
153
 
                          ((b"foo", b"2"), b"blarh\n"),
154
 
                          ], sorted(node.iteritems(None)))
 
147
        self.assertEqual([(("foo", "1"), "bar\nbaz"),
 
148
                          (("foo", "2"), "blarh\n"),
 
149
                         ], sorted(node.iteritems(None)))
155
150
        self.assertIs(chk_map._unknown, node._search_prefix)
156
 
        self.assertEqual(b'foo\x00', node._common_serialised_prefix)
 
151
        self.assertEqual('foo\x00', node._common_serialised_prefix)
157
152
 
158
153
    def test_key_after_map(self):
159
154
        node = self.module._deserialise_leaf_node(
160
 
            b"chkleaf:\n10\n1\n0\n\n", (b"sha1:1234",))
161
 
        node.map(None, (b"foo bar",), b"baz quux")
 
155
            "chkleaf:\n10\n1\n0\n\n", ("sha1:1234",))
 
156
        node.map(None, ("foo bar",), "baz quux")
162
157
        self.assertEqual(None, node.key())
163
158
 
164
159
    def test_key_after_unmap(self):
165
160
        node = self.module._deserialise_leaf_node(
166
 
            b"chkleaf:\n0\n1\n2\n\nfoo bar\x001\nbaz\nquux\x001\nblarh\n",
167
 
            (b"sha1:1234",))
168
 
        node.unmap(None, (b"foo bar",))
 
161
            "chkleaf:\n0\n1\n2\n\nfoo bar\x001\nbaz\nquux\x001\nblarh\n",
 
162
            ("sha1:1234",))
 
163
        node.unmap(None, ("foo bar",))
169
164
        self.assertEqual(None, node.key())
170
165
 
171
166
 
175
170
 
176
171
    def assertDeserialiseErrors(self, text):
177
172
        self.assertRaises((ValueError, IndexError),
178
 
                          self.module._deserialise_internal_node, text,
179
 
                          stuple(b'not-a-real-sha',))
 
173
            self.module._deserialise_internal_node, text,
 
174
                stuple('not-a-real-sha',))
180
175
 
181
176
    def test_raises_on_non_internal(self):
182
 
        self.assertDeserialiseErrors(b'')
183
 
        self.assertDeserialiseErrors(b'short\n')
184
 
        self.assertDeserialiseErrors(b'chknotnode:\n')
185
 
        self.assertDeserialiseErrors(b'chknode:x\n')
186
 
        self.assertDeserialiseErrors(b'chknode:\n')
187
 
        self.assertDeserialiseErrors(b'chknode:\nnotint\n')
188
 
        self.assertDeserialiseErrors(b'chknode:\n10\n')
189
 
        self.assertDeserialiseErrors(b'chknode:\n10\n256\n')
190
 
        self.assertDeserialiseErrors(b'chknode:\n10\n256\n10\n')
 
177
        self.assertDeserialiseErrors('')
 
178
        self.assertDeserialiseErrors('short\n')
 
179
        self.assertDeserialiseErrors('chknotnode:\n')
 
180
        self.assertDeserialiseErrors('chknode:x\n')
 
181
        self.assertDeserialiseErrors('chknode:\n')
 
182
        self.assertDeserialiseErrors('chknode:\nnotint\n')
 
183
        self.assertDeserialiseErrors('chknode:\n10\n')
 
184
        self.assertDeserialiseErrors('chknode:\n10\n256\n')
 
185
        self.assertDeserialiseErrors('chknode:\n10\n256\n10\n')
191
186
        # no trailing newline
192
 
        self.assertDeserialiseErrors(b'chknode:\n10\n256\n0\n1\nfo')
 
187
        self.assertDeserialiseErrors('chknode:\n10\n256\n0\n1\nfo')
193
188
 
194
189
    def test_deserialise_one(self):
195
190
        node = self.module._deserialise_internal_node(
196
 
            b"chknode:\n10\n1\n1\n\na\x00sha1:abcd\n", stuple(b'sha1:1234',))
 
191
            "chknode:\n10\n1\n1\n\na\x00sha1:abcd\n", stuple('sha1:1234',))
197
192
        self.assertIsInstance(node, chk_map.InternalNode)
198
193
        self.assertEqual(1, len(node))
199
194
        self.assertEqual(10, node.maximum_size)
200
 
        self.assertEqual((b"sha1:1234",), node.key())
201
 
        self.assertEqual(b'', node._search_prefix)
202
 
        self.assertEqual({b'a': (b'sha1:abcd',)}, node._items)
 
195
        self.assertEqual(("sha1:1234",), node.key())
 
196
        self.assertEqual('', node._search_prefix)
 
197
        self.assertEqual({'a': ('sha1:abcd',)}, node._items)
203
198
 
204
199
    def test_deserialise_with_prefix(self):
205
200
        node = self.module._deserialise_internal_node(
206
 
            b"chknode:\n10\n1\n1\npref\na\x00sha1:abcd\n",
207
 
            stuple(b'sha1:1234',))
 
201
            "chknode:\n10\n1\n1\npref\na\x00sha1:abcd\n", stuple('sha1:1234',))
208
202
        self.assertIsInstance(node, chk_map.InternalNode)
209
203
        self.assertEqual(1, len(node))
210
204
        self.assertEqual(10, node.maximum_size)
211
 
        self.assertEqual((b"sha1:1234",), node.key())
212
 
        self.assertEqual(b'pref', node._search_prefix)
213
 
        self.assertEqual({b'prefa': (b'sha1:abcd',)}, node._items)
 
205
        self.assertEqual(("sha1:1234",), node.key())
 
206
        self.assertEqual('pref', node._search_prefix)
 
207
        self.assertEqual({'prefa': ('sha1:abcd',)}, node._items)
214
208
 
215
209
        node = self.module._deserialise_internal_node(
216
 
            b"chknode:\n10\n1\n1\npref\n\x00sha1:abcd\n",
217
 
            stuple(b'sha1:1234',))
 
210
            "chknode:\n10\n1\n1\npref\n\x00sha1:abcd\n", stuple('sha1:1234',))
218
211
        self.assertIsInstance(node, chk_map.InternalNode)
219
212
        self.assertEqual(1, len(node))
220
213
        self.assertEqual(10, node.maximum_size)
221
 
        self.assertEqual((b"sha1:1234",), node.key())
222
 
        self.assertEqual(b'pref', node._search_prefix)
223
 
        self.assertEqual({b'pref': (b'sha1:abcd',)}, node._items)
 
214
        self.assertEqual(("sha1:1234",), node.key())
 
215
        self.assertEqual('pref', node._search_prefix)
 
216
        self.assertEqual({'pref': ('sha1:abcd',)}, node._items)
224
217
 
225
218
    def test_deserialise_pref_with_null(self):
226
219
        node = self.module._deserialise_internal_node(
227
 
            b"chknode:\n10\n1\n1\npref\x00fo\n\x00sha1:abcd\n",
228
 
            stuple(b'sha1:1234',))
 
220
            "chknode:\n10\n1\n1\npref\x00fo\n\x00sha1:abcd\n",
 
221
            stuple('sha1:1234',))
229
222
        self.assertIsInstance(node, chk_map.InternalNode)
230
223
        self.assertEqual(1, len(node))
231
224
        self.assertEqual(10, node.maximum_size)
232
 
        self.assertEqual((b"sha1:1234",), node.key())
233
 
        self.assertEqual(b'pref\x00fo', node._search_prefix)
234
 
        self.assertEqual({b'pref\x00fo': (b'sha1:abcd',)}, node._items)
 
225
        self.assertEqual(("sha1:1234",), node.key())
 
226
        self.assertEqual('pref\x00fo', node._search_prefix)
 
227
        self.assertEqual({'pref\x00fo': ('sha1:abcd',)}, node._items)
235
228
 
236
229
    def test_deserialise_with_null_pref(self):
237
230
        node = self.module._deserialise_internal_node(
238
 
            b"chknode:\n10\n1\n1\npref\x00fo\n\x00\x00sha1:abcd\n",
239
 
            stuple(b'sha1:1234',))
 
231
            "chknode:\n10\n1\n1\npref\x00fo\n\x00\x00sha1:abcd\n",
 
232
            stuple('sha1:1234',))
240
233
        self.assertIsInstance(node, chk_map.InternalNode)
241
234
        self.assertEqual(1, len(node))
242
235
        self.assertEqual(10, node.maximum_size)
243
 
        self.assertEqual((b"sha1:1234",), node.key())
244
 
        self.assertEqual(b'pref\x00fo', node._search_prefix)
245
 
        self.assertEqual({b'pref\x00fo\x00': (b'sha1:abcd',)}, node._items)
246
 
 
247
 
 
248
 
class Test_BytesToTextKey(tests.TestCase):
249
 
 
250
 
    def assertBytesToTextKey(self, key, bytes):
251
 
        self.assertEqual(key,
252
 
                         self.module._bytes_to_text_key(bytes))
253
 
 
254
 
    def assertBytesToTextKeyRaises(self, bytes):
255
 
        # These are invalid bytes, and we want to make sure the code under test
256
 
        # raises an exception rather than segfaults, etc. We don't particularly
257
 
        # care what exception.
258
 
        self.assertRaises(Exception, self.module._bytes_to_text_key, bytes)
259
 
 
260
 
    def test_file(self):
261
 
        self.assertBytesToTextKey((b'file-id', b'revision-id'),
262
 
                                  b'file: file-id\nparent-id\nname\nrevision-id\n'
263
 
                                  b'da39a3ee5e6b4b0d3255bfef95601890afd80709\n100\nN')
264
 
 
265
 
    def test_invalid_no_kind(self):
266
 
        self.assertBytesToTextKeyRaises(
267
 
            b'file  file-id\nparent-id\nname\nrevision-id\n'
268
 
            b'da39a3ee5e6b4b0d3255bfef95601890afd80709\n100\nN')
269
 
 
270
 
    def test_invalid_no_space(self):
271
 
        self.assertBytesToTextKeyRaises(
272
 
            b'file:file-id\nparent-id\nname\nrevision-id\n'
273
 
            b'da39a3ee5e6b4b0d3255bfef95601890afd80709\n100\nN')
274
 
 
275
 
    def test_invalid_too_short_file_id(self):
276
 
        self.assertBytesToTextKeyRaises(b'file:file-id')
277
 
 
278
 
    def test_invalid_too_short_parent_id(self):
279
 
        self.assertBytesToTextKeyRaises(b'file:file-id\nparent-id')
280
 
 
281
 
    def test_invalid_too_short_name(self):
282
 
        self.assertBytesToTextKeyRaises(b'file:file-id\nparent-id\nname')
283
 
 
284
 
    def test_dir(self):
285
 
        self.assertBytesToTextKey((b'dir-id', b'revision-id'),
286
 
                                  b'dir: dir-id\nparent-id\nname\nrevision-id')
 
236
        self.assertEqual(("sha1:1234",), node.key())
 
237
        self.assertEqual('pref\x00fo', node._search_prefix)
 
238
        self.assertEqual({'pref\x00fo\x00': ('sha1:abcd',)}, node._items)