~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test__chunks_to_lines.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
"""Tests for chunks_to_lines."""
19
19
 
20
20
from bzrlib import tests
 
21
from bzrlib.tests import (
 
22
    features,
 
23
    )
21
24
 
22
25
 
23
26
def load_tests(standard_tests, module, loader):
29
32
# test_osutils depends on this feature being around. We can't just use the one
30
33
# generated by load_tests, because if we only load osutils but not this module,
31
34
# then that code never gets run
32
 
compiled_chunkstolines_feature = tests.ModuleAvailableFeature(
33
 
                                    'bzrlib._chunks_to_lines_pyx')
 
35
compiled_chunkstolines_feature = features.ModuleAvailableFeature(
 
36
    'bzrlib._chunks_to_lines_pyx')
34
37
 
35
38
 
36
39
class TestChunksToLines(tests.TestCase):