← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_repository.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_repository.py
57
57
from bzrlib.repofmt import (
58
58
    groupcompress_repo,
59
59
    knitrepo,
 
60
    knitpack_repo,
60
61
    pack_repo,
61
62
    )
62
63
 
136
137
            format.initialize(dir)
137
138
            t = transport.get_transport(url)
138
139
            found_format = repository.RepositoryFormat.find_format(dir)
139
 
            self.failUnless(isinstance(found_format, format.__class__))
 
140
            self.assertIsInstance(found_format, format.__class__)
140
141
        check_format(repository.format_registry.get_default(), "bar")
141
142
 
142
143
    def test_find_format_no_repository(self):
747
748
        source = self.make_repository('source', format='pack-0.92')
748
749
        target = self.make_repository('target', format='pack-0.92')
749
750
        stream_source = source._get_source(target._format)
750
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
751
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
751
752
 
752
753
    def test_source_to_exact_pack_rich_root_pack(self):
753
754
        source = self.make_repository('source', format='rich-root-pack')
754
755
        target = self.make_repository('target', format='rich-root-pack')
755
756
        stream_source = source._get_source(target._format)
756
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
757
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
757
758
 
758
759
    def test_source_to_exact_pack_19(self):
759
760
        source = self.make_repository('source', format='1.9')
760
761
        target = self.make_repository('target', format='1.9')
761
762
        stream_source = source._get_source(target._format)
762
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
763
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
763
764
 
764
765
    def test_source_to_exact_pack_19_rich_root(self):
765
766
        source = self.make_repository('source', format='1.9-rich-root')
766
767
        target = self.make_repository('target', format='1.9-rich-root')
767
768
        stream_source = source._get_source(target._format)
768
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
769
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
769
770
 
770
771
    def test_source_to_remote_exact_pack_19(self):
771
772
        trans = self.make_smart_server('target')
774
775
        target = self.make_repository('target', format='1.9')
775
776
        target = repository.Repository.open(trans.base)
776
777
        stream_source = source._get_source(target._format)
777
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
 
778
        self.assertIsInstance(stream_source, knitpack_repo.KnitPackStreamSource)
778
779
 
779
780
    def test_stream_source_to_non_exact(self):
780
781
        source = self.make_repository('source', format='pack-0.92')
1443
1444
        # Because of how they were built, they correspond to
1444
1445
        # ['D', 'C', 'B', 'A']
1445
1446
        packs = b.repository._pack_collection.packs
1446
 
        packer = pack_repo.Packer(b.repository._pack_collection,
 
1447
        packer = knitpack_repo.KnitPacker(b.repository._pack_collection,
1447
1448
                                  packs, 'testing',
1448
1449
                                  revision_ids=['B', 'C'])
1449
1450
        # Now, when we are copying the B & C revisions, their pack files should
1463
1464
        return repo._pack_collection
1464
1465
 
1465
1466
    def test_open_pack_will_optimise(self):
1466
 
        packer = pack_repo.OptimisingPacker(self.get_pack_collection(),
 
1467
        packer = knitpack_repo.OptimisingKnitPacker(self.get_pack_collection(),
1467
1468
                                            [], '.test')
1468
1469
        new_pack = packer.open_pack()
1469
1470
        self.addCleanup(new_pack.abort) # ensure cleanup