/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 breezy/tests/test__annotator.py

  • Committer: Breezy landing bot
  • Author(s): Colin Watson
  • Date: 2020-11-16 21:47:08 UTC
  • mfrom: (7521.1.1 remove-lp-workaround)
  • Revision ID: breezy.the.bot@gmail.com-20201116214708-jos209mgxi41oy15
Remove breezy.git workaround for bazaar.launchpad.net.

Merged from https://code.launchpad.net/~cjwatson/brz/remove-lp-workaround/+merge/393710

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test__annotator.py
16
16
 
17
17
"""Tests for Annotators."""
18
18
 
19
 
from bzrlib import (
 
19
from .. import (
20
20
    annotate,
21
21
    errors,
22
 
    knit,
23
22
    revision,
24
23
    tests,
25
24
    )
26
25
 
27
 
 
28
 
def load_tests(standard_tests, module, loader):
 
26
from ..bzr import (
 
27
    knit,
 
28
    )
 
29
 
 
30
 
 
31
def load_tests(loader, standard_tests, pattern):
29
32
    """Parameterize tests for all versions of groupcompress."""
30
33
    suite, _ = tests.permute_tests_for_extension(standard_tests, loader,
31
 
        'bzrlib._annotator_py', 'bzrlib._annotator_pyx')
 
34
                                                 'breezy._annotator_py', 'breezy._annotator_pyx')
32
35
    return suite
33
36
 
34
37
 
35
38
class TestAnnotator(tests.TestCaseWithMemoryTransport):
36
39
 
37
 
    module = None # Set by load_tests
 
40
    module = None  # Set by load_tests
38
41
 
39
 
    fa_key = ('f-id', 'a-id')
40
 
    fb_key = ('f-id', 'b-id')
41
 
    fc_key = ('f-id', 'c-id')
42
 
    fd_key = ('f-id', 'd-id')
43
 
    fe_key = ('f-id', 'e-id')
44
 
    ff_key = ('f-id', 'f-id')
 
42
    fa_key = (b'f-id', b'a-id')
 
43
    fb_key = (b'f-id', b'b-id')
 
44
    fc_key = (b'f-id', b'c-id')
 
45
    fd_key = (b'f-id', b'd-id')
 
46
    fe_key = (b'f-id', b'e-id')
 
47
    ff_key = (b'f-id', b'f-id')
45
48
 
46
49
    def make_no_graph_texts(self):
47
50
        factory = knit.make_pack_factory(False, False, 2)
48
51
        self.vf = factory(self.get_transport())
49
52
        self.ann = self.module.Annotator(self.vf)
50
 
        self.vf.add_lines(self.fa_key, (), ['simple\n', 'content\n'])
51
 
        self.vf.add_lines(self.fb_key, (), ['simple\n', 'new content\n'])
 
53
        self.vf.add_lines(self.fa_key, (), [b'simple\n', b'content\n'])
 
54
        self.vf.add_lines(self.fb_key, (), [b'simple\n', b'new content\n'])
52
55
 
53
56
    def make_simple_text(self):
54
57
        # TODO: all we really need is a VersionedFile instance, we'd like to
61
64
        #  A    'simple|content|'
62
65
        #  |
63
66
        #  B    'simple|new content|'
64
 
        self.vf.add_lines(self.fa_key, [], ['simple\n', 'content\n'])
 
67
        self.vf.add_lines(self.fa_key, [], [b'simple\n', b'content\n'])
65
68
        self.vf.add_lines(self.fb_key, [self.fa_key],
66
 
                          ['simple\n', 'new content\n'])
 
69
                          [b'simple\n', b'new content\n'])
67
70
 
68
71
    def make_merge_text(self):
69
72
        self.make_simple_text()
75
78
        #  |/
76
79
        #  D    'simple|from c|new content|introduced in merge|'
77
80
        self.vf.add_lines(self.fc_key, [self.fa_key],
78
 
                          ['simple\n', 'from c\n', 'content\n'])
 
81
                          [b'simple\n', b'from c\n', b'content\n'])
79
82
        self.vf.add_lines(self.fd_key, [self.fb_key, self.fc_key],
80
 
                          ['simple\n', 'from c\n', 'new content\n',
81
 
                           'introduced in merge\n'])
 
83
                          [b'simple\n', b'from c\n', b'new content\n',
 
84
                           b'introduced in merge\n'])
82
85
 
83
86
    def make_common_merge_text(self):
84
87
        """Both sides of the merge will have introduced a line."""
91
94
        #  |/
92
95
        #  D    'simple|new content|'
93
96
        self.vf.add_lines(self.fc_key, [self.fa_key],
94
 
                          ['simple\n', 'new content\n'])
 
97
                          [b'simple\n', b'new content\n'])
95
98
        self.vf.add_lines(self.fd_key, [self.fb_key, self.fc_key],
96
 
                          ['simple\n', 'new content\n'])
 
99
                          [b'simple\n', b'new content\n'])
97
100
 
98
101
    def make_many_way_common_merge_text(self):
99
102
        self.make_simple_text()
109
112
        #  |  /
110
113
        #  F-'    'simple|new content|'
111
114
        self.vf.add_lines(self.fc_key, [self.fa_key],
112
 
                          ['simple\n', 'new content\n'])
 
115
                          [b'simple\n', b'new content\n'])
113
116
        self.vf.add_lines(self.fd_key, [self.fb_key, self.fc_key],
114
 
                          ['simple\n', 'new content\n'])
 
117
                          [b'simple\n', b'new content\n'])
115
118
        self.vf.add_lines(self.fe_key, [self.fa_key],
116
 
                          ['simple\n', 'new content\n'])
 
119
                          [b'simple\n', b'new content\n'])
117
120
        self.vf.add_lines(self.ff_key, [self.fd_key, self.fe_key],
118
 
                          ['simple\n', 'new content\n'])
 
121
                          [b'simple\n', b'new content\n'])
119
122
 
120
123
    def make_merge_and_restored_text(self):
121
124
        self.make_simple_text()
128
131
        #    D  'simple|content|'
129
132
        # c reverts back to 'a' for the new content line
130
133
        self.vf.add_lines(self.fc_key, [self.fb_key],
131
 
                          ['simple\n', 'content\n'])
 
134
                          [b'simple\n', b'content\n'])
132
135
        # d merges 'a' and 'c', to find both claim last modified
133
136
        self.vf.add_lines(self.fd_key, [self.fa_key, self.fc_key],
134
 
                          ['simple\n', 'content\n'])
 
137
                          [b'simple\n', b'content\n'])
135
138
 
136
139
    def assertAnnotateEqual(self, expected_annotation, key, exp_text=None):
137
140
        annotation, lines = self.ann.annotate(key)
138
141
        self.assertEqual(expected_annotation, annotation)
139
142
        if exp_text is None:
140
 
            record = self.vf.get_record_stream([key], 'unordered', True).next()
 
143
            record = next(self.vf.get_record_stream([key], 'unordered', True))
141
144
            exp_text = record.get_bytes_as('fulltext')
142
 
        self.assertEqualDiff(exp_text, ''.join(lines))
 
145
        self.assertEqualDiff(exp_text, b''.join(lines))
143
146
 
144
147
    def test_annotate_missing(self):
145
148
        self.make_simple_text()
146
149
        self.assertRaises(errors.RevisionNotPresent,
147
 
                          self.ann.annotate, ('not', 'present'))
 
150
                          self.ann.annotate, (b'not', b'present'))
148
151
 
149
152
    def test_annotate_simple(self):
150
153
        self.make_simple_text()
151
 
        self.assertAnnotateEqual([(self.fa_key,)]*2, self.fa_key)
 
154
        self.assertAnnotateEqual([(self.fa_key,)] * 2, self.fa_key)
152
155
        self.assertAnnotateEqual([(self.fa_key,), (self.fb_key,)], self.fb_key)
153
156
 
154
157
    def test_annotate_merge_text(self):
175
178
 
176
179
    def test_annotate_flat_simple(self):
177
180
        self.make_simple_text()
178
 
        self.assertEqual([(self.fa_key, 'simple\n'),
179
 
                          (self.fa_key, 'content\n'),
180
 
                         ], self.ann.annotate_flat(self.fa_key))
181
 
        self.assertEqual([(self.fa_key, 'simple\n'),
182
 
                          (self.fb_key, 'new content\n'),
183
 
                         ], self.ann.annotate_flat(self.fb_key))
 
181
        self.assertEqual([(self.fa_key, b'simple\n'),
 
182
                          (self.fa_key, b'content\n'),
 
183
                          ], self.ann.annotate_flat(self.fa_key))
 
184
        self.assertEqual([(self.fa_key, b'simple\n'),
 
185
                          (self.fb_key, b'new content\n'),
 
186
                          ], self.ann.annotate_flat(self.fb_key))
184
187
 
185
188
    def test_annotate_flat_merge_and_restored_text(self):
186
189
        self.make_merge_and_restored_text()
187
190
        # fc is a simple dominator of fa
188
 
        self.assertEqual([(self.fa_key, 'simple\n'),
189
 
                          (self.fc_key, 'content\n'),
190
 
                         ], self.ann.annotate_flat(self.fd_key))
 
191
        self.assertEqual([(self.fa_key, b'simple\n'),
 
192
                          (self.fc_key, b'content\n'),
 
193
                          ], self.ann.annotate_flat(self.fd_key))
191
194
 
192
195
    def test_annotate_common_merge_text(self):
193
196
        self.make_common_merge_text()
194
197
        # there is no common point, so we just pick the lexicographical lowest
195
 
        # and 'b-id' comes before 'c-id'
196
 
        self.assertEqual([(self.fa_key, 'simple\n'),
197
 
                          (self.fb_key, 'new content\n'),
198
 
                         ], self.ann.annotate_flat(self.fd_key))
 
198
        # and b'b-id' comes before b'c-id'
 
199
        self.assertEqual([(self.fa_key, b'simple\n'),
 
200
                          (self.fb_key, b'new content\n'),
 
201
                          ], self.ann.annotate_flat(self.fd_key))
199
202
 
200
203
    def test_annotate_many_way_common_merge_text(self):
201
204
        self.make_many_way_common_merge_text()
202
 
        self.assertEqual([(self.fa_key, 'simple\n'),
203
 
                         (self.fb_key, 'new content\n')],
 
205
        self.assertEqual([(self.fa_key, b'simple\n'),
 
206
                          (self.fb_key, b'new content\n')],
204
207
                         self.ann.annotate_flat(self.ff_key))
205
208
 
206
209
    def test_annotate_flat_respects_break_ann_tie(self):
207
 
        tiebreaker = annotate._break_annotation_tie
208
 
        try:
209
 
            calls = []
210
 
            def custom_tiebreaker(annotated_lines):
211
 
                self.assertEqual(2, len(annotated_lines))
212
 
                left = annotated_lines[0]
213
 
                self.assertEqual(2, len(left))
214
 
                self.assertEqual('new content\n', left[1])
215
 
                right = annotated_lines[1]
216
 
                self.assertEqual(2, len(right))
217
 
                self.assertEqual('new content\n', right[1])
218
 
                calls.append((left[0], right[0]))
219
 
                # Our custom tiebreaker takes the *largest* value, rather than
220
 
                # the *smallest* value
221
 
                if left[0] < right[0]:
222
 
                    return right
223
 
                else:
224
 
                    return left
225
 
            annotate._break_annotation_tie = custom_tiebreaker
226
 
            self.make_many_way_common_merge_text()
227
 
            self.assertEqual([(self.fa_key, 'simple\n'),
228
 
                             (self.fe_key, 'new content\n')],
229
 
                             self.ann.annotate_flat(self.ff_key))
230
 
            self.assertEqual([(self.fe_key, self.fc_key),
231
 
                              (self.fe_key, self.fb_key)], calls)
232
 
        finally:
233
 
            annotate._break_annotation_tie = tiebreaker
 
210
        seen = set()
234
211
 
 
212
        def custom_tiebreaker(annotated_lines):
 
213
            self.assertEqual(2, len(annotated_lines))
 
214
            left = annotated_lines[0]
 
215
            self.assertEqual(2, len(left))
 
216
            self.assertEqual(b'new content\n', left[1])
 
217
            right = annotated_lines[1]
 
218
            self.assertEqual(2, len(right))
 
219
            self.assertEqual(b'new content\n', right[1])
 
220
            seen.update([left[0], right[0]])
 
221
            # Our custom tiebreaker takes the *largest* value, rather than
 
222
            # the *smallest* value
 
223
            if left[0] < right[0]:
 
224
                return right
 
225
            else:
 
226
                return left
 
227
        self.overrideAttr(annotate, '_break_annotation_tie', custom_tiebreaker)
 
228
        self.make_many_way_common_merge_text()
 
229
        self.assertEqual([(self.fa_key, b'simple\n'),
 
230
                          (self.fe_key, b'new content\n')],
 
231
                         self.ann.annotate_flat(self.ff_key))
 
232
        # Calls happen in set iteration order but should keys should be seen
 
233
        self.assertEqual({self.fb_key, self.fc_key, self.fe_key}, seen)
235
234
 
236
235
    def test_needed_keys_simple(self):
237
236
        self.make_simple_text()
246
245
        keys, ann_keys = self.ann._get_needed_keys(self.ff_key)
247
246
        self.assertEqual([self.fa_key, self.fb_key, self.fc_key,
248
247
                          self.fd_key, self.fe_key, self.ff_key,
249
 
                         ], sorted(keys))
 
248
                          ], sorted(keys))
250
249
        self.assertEqual({self.fa_key: 3,
251
250
                          self.fb_key: 1,
252
251
                          self.fc_key: 1,
253
252
                          self.fd_key: 1,
254
253
                          self.fe_key: 1,
255
254
                          self.ff_key: 1,
256
 
                         }, self.ann._num_needed_children)
 
255
                          }, self.ann._num_needed_children)
257
256
        self.assertEqual(set(), ann_keys)
258
257
 
259
258
    def test_needed_keys_with_special_text(self):
260
259
        self.make_many_way_common_merge_text()
261
 
        spec_key = ('f-id', revision.CURRENT_REVISION)
262
 
        spec_text = 'simple\nnew content\nlocally modified\n'
 
260
        spec_key = (b'f-id', revision.CURRENT_REVISION)
 
261
        spec_text = b'simple\nnew content\nlocally modified\n'
263
262
        self.ann.add_special_text(spec_key, [self.fd_key, self.fe_key],
264
263
                                  spec_text)
265
264
        keys, ann_keys = self.ann._get_needed_keys(spec_key)
266
265
        self.assertEqual([self.fa_key, self.fb_key, self.fc_key,
267
266
                          self.fd_key, self.fe_key,
268
 
                         ], sorted(keys))
 
267
                          ], sorted(keys))
269
268
        self.assertEqual([spec_key], sorted(ann_keys))
270
269
 
271
270
    def test_needed_keys_with_parent_texts(self):
278
277
        #  |  /
279
278
        #  F-'    'simple|new content|'
280
279
        self.ann._parent_map[self.fd_key] = (self.fb_key, self.fc_key)
281
 
        self.ann._text_cache[self.fd_key] = ['simple\n', 'new content\n']
 
280
        self.ann._text_cache[self.fd_key] = [b'simple\n', b'new content\n']
282
281
        self.ann._annotations_cache[self.fd_key] = [
283
282
            (self.fa_key,),
284
283
            (self.fb_key, self.fc_key),
285
284
            ]
286
285
        self.ann._parent_map[self.fe_key] = (self.fa_key,)
287
 
        self.ann._text_cache[self.fe_key] = ['simple\n', 'new content\n']
 
286
        self.ann._text_cache[self.fe_key] = [b'simple\n', b'new content\n']
288
287
        self.ann._annotations_cache[self.fe_key] = [
289
288
            (self.fa_key,),
290
289
            (self.fe_key,),
294
293
        self.assertEqual({self.fd_key: 1,
295
294
                          self.fe_key: 1,
296
295
                          self.ff_key: 1,
297
 
                         }, self.ann._num_needed_children)
 
296
                          }, self.ann._num_needed_children)
298
297
        self.assertEqual([], sorted(ann_keys))
299
298
 
300
299
    def test_record_annotation_removes_texts(self):
308
307
                          self.fd_key: 1,
309
308
                          self.fe_key: 1,
310
309
                          self.ff_key: 1,
311
 
                         }, self.ann._num_needed_children)
 
310
                          }, self.ann._num_needed_children)
312
311
        self.assertEqual([self.fa_key, self.fb_key, self.fc_key,
313
312
                          self.fd_key, self.fe_key, self.ff_key,
314
 
                         ], sorted(self.ann._text_cache.keys()))
 
313
                          ], sorted(self.ann._text_cache.keys()))
315
314
        self.ann._record_annotation(self.fa_key, [], [])
316
315
        self.ann._record_annotation(self.fb_key, [self.fa_key], [])
317
316
        self.assertEqual({self.fa_key: 2,
320
319
                          self.fd_key: 1,
321
320
                          self.fe_key: 1,
322
321
                          self.ff_key: 1,
323
 
                         }, self.ann._num_needed_children)
 
322
                          }, self.ann._num_needed_children)
324
323
        self.assertTrue(self.fa_key in self.ann._text_cache)
325
324
        self.assertTrue(self.fa_key in self.ann._annotations_cache)
326
325
        self.ann._record_annotation(self.fc_key, [self.fa_key], [])
327
 
        self.ann._record_annotation(self.fd_key, [self.fb_key, self.fc_key], [])
 
326
        self.ann._record_annotation(
 
327
            self.fd_key, [self.fb_key, self.fc_key], [])
328
328
        self.assertEqual({self.fa_key: 1,
329
329
                          self.fb_key: 0,
330
330
                          self.fc_key: 0,
331
331
                          self.fd_key: 1,
332
332
                          self.fe_key: 1,
333
333
                          self.ff_key: 1,
334
 
                         }, self.ann._num_needed_children)
 
334
                          }, self.ann._num_needed_children)
335
335
        self.assertTrue(self.fa_key in self.ann._text_cache)
336
336
        self.assertTrue(self.fa_key in self.ann._annotations_cache)
337
337
        self.assertFalse(self.fb_key in self.ann._text_cache)
355
355
        #  |   E  'simple|new content|'
356
356
        #  |  /
357
357
        #  SPEC   'simple|new content|locally modified|'
358
 
        spec_key = ('f-id', revision.CURRENT_REVISION)
359
 
        spec_text = 'simple\nnew content\nlocally modified\n'
 
358
        spec_key = (b'f-id', revision.CURRENT_REVISION)
 
359
        spec_text = b'simple\nnew content\nlocally modified\n'
360
360
        self.ann.add_special_text(spec_key, [self.fd_key, self.fe_key],
361
361
                                  spec_text)
362
362
        self.assertAnnotateEqual([(self.fa_key,),
363
363
                                  (self.fb_key, self.fc_key, self.fe_key),
364
364
                                  (spec_key,),
365
 
                                 ], spec_key,
 
365
                                  ], spec_key,
366
366
                                 exp_text=spec_text)
367
367
 
368
368
    def test_no_graph(self):
369
369
        self.make_no_graph_texts()
370
370
        self.assertAnnotateEqual([(self.fa_key,),
371
371
                                  (self.fa_key,),
372
 
                                 ], self.fa_key)
 
372
                                  ], self.fa_key)
373
373
        self.assertAnnotateEqual([(self.fb_key,),
374
374
                                  (self.fb_key,),
375
 
                                 ], self.fb_key)
 
375
                                  ], self.fb_key)