/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__annotator.py

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test__annotator.py
16
16
 
17
17
"""Tests for Annotators."""
18
18
 
19
 
from .. import (
 
19
from bzrlib import (
20
20
    annotate,
21
21
    errors,
 
22
    knit,
22
23
    revision,
23
24
    tests,
24
25
    )
25
26
 
26
 
from ..bzr import (
27
 
    knit,
28
 
    )
29
 
 
30
 
 
31
 
def load_tests(loader, standard_tests, pattern):
 
27
 
 
28
def load_tests(standard_tests, module, loader):
32
29
    """Parameterize tests for all versions of groupcompress."""
33
30
    suite, _ = tests.permute_tests_for_extension(standard_tests, loader,
34
 
        'breezy._annotator_py', 'breezy._annotator_pyx')
 
31
        'bzrlib._annotator_py', 'bzrlib._annotator_pyx')
35
32
    return suite
36
33
 
37
34
 
140
137
        annotation, lines = self.ann.annotate(key)
141
138
        self.assertEqual(expected_annotation, annotation)
142
139
        if exp_text is None:
143
 
            record = next(self.vf.get_record_stream([key], 'unordered', True))
 
140
            record = self.vf.get_record_stream([key], 'unordered', True).next()
144
141
            exp_text = record.get_bytes_as('fulltext')
145
142
        self.assertEqualDiff(exp_text, ''.join(lines))
146
143