/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: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

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