← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_knit.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:
bzrlib/tests/test_knit.py
62
62
    network_bytes_to_kind_and_offset,
63
63
    RecordingVersionedFilesDecorator,
64
64
    )
65
 
 
66
 
 
67
 
compiled_knit_feature = tests.ModuleAvailableFeature(
68
 
                            'bzrlib._knit_load_data_pyx')
 
65
from bzrlib.tests import (
 
66
    features,
 
67
    )
 
68
 
 
69
 
 
70
compiled_knit_feature = features.ModuleAvailableFeature(
 
71
    'bzrlib._knit_load_data_pyx')
69
72
 
70
73
 
71
74
class KnitContentTestsMixin(object):
1600
1603
        # could leave an empty .kndx file, which bzr would later claim was a
1601
1604
        # corrupted file since the header was not present. In reality, the file
1602
1605
        # just wasn't created, so it should be ignored.
1603
 
        t = transport.get_transport('.')
 
1606
        t = transport.get_transport_from_path('.')
1604
1607
        t.put_bytes('test.kndx', '')
1605
1608
 
1606
1609
        knit = self.make_test_knit()
1607
1610
 
1608
1611
    def test_knit_index_checks_header(self):
1609
 
        t = transport.get_transport('.')
 
1612
        t = transport.get_transport_from_path('.')
1610
1613
        t.put_bytes('test.kndx', '# not really a knit header\n\n')
1611
1614
        k = self.make_test_knit()
1612
1615
        self.assertRaises(KnitHeaderError, k.keys)