← 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: Vincent Ladeuil
  • Date: 2011-06-15 11:36:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5975.
  • Revision ID: v.ladeuil+lp@free.fr-20110615113605-p7zyyfry9wy1hquc
https://launchpad.net/bugs/788000
Make ContentConflict resolution more robust

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