/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 breezy/tests/per_pack_repository.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 16:40:42 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610164042-zrxqgy2htyduvke2
MergeĀ rename-controldirĀ branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
61
61
    """
62
62
 
63
63
    def get_format(self):
64
 
        return controldir.format_registry.make_bzrdir(self.format_name)
 
64
        return controldir.format_registry.make_controldir(self.format_name)
65
65
 
66
66
    def test_attribute__fetch_order(self):
67
67
        """Packs do not need ordered data retrieval."""
88
88
        # in case of side effects of locking.
89
89
        repo.lock_write()
90
90
        repo.unlock()
91
 
        t = repo.bzrdir.get_repository_transport(None)
 
91
        t = repo.controldir.get_repository_transport(None)
92
92
        self.check_format(t)
93
93
        # XXX: no locks left when unlocked at the moment
94
94
        # self.assertEqualDiff('', t.get('lock').read())
130
130
        format = self.get_format()
131
131
        repo = self.make_repository('.', shared=True, format=format)
132
132
        # we want:
133
 
        t = repo.bzrdir.get_repository_transport(None)
 
133
        t = repo.controldir.get_repository_transport(None)
134
134
        self.check_format(t)
135
135
        # XXX: no locks left when unlocked at the moment
136
136
        # self.assertEqualDiff('', t.get('lock').read())
143
143
        repo = self.make_repository('.', shared=True, format=format)
144
144
        repo.set_make_working_trees(False)
145
145
        # we want:
146
 
        t = repo.bzrdir.get_repository_transport(None)
 
146
        t = repo.controldir.get_repository_transport(None)
147
147
        self.check_format(t)
148
148
        # XXX: no locks left when unlocked at the moment
149
149
        # self.assertEqualDiff('', t.get('lock').read())
159
159
    def test_adding_revision_creates_pack_indices(self):
160
160
        format = self.get_format()
161
161
        tree = self.make_branch_and_tree('.', format=format)
162
 
        trans = tree.branch.repository.bzrdir.get_repository_transport(None)
 
162
        trans = tree.branch.repository.controldir.get_repository_transport(None)
163
163
        self.assertEqual([],
164
164
            list(self.index_class(trans, 'pack-names', None).iter_all_entries()))
165
165
        tree.commit('foobarbaz')
180
180
        tree1 = self.make_branch_and_tree('1', format=format)
181
181
        tree2 = self.make_branch_and_tree('2', format=format)
182
182
        tree1.branch.repository.fetch(tree2.branch.repository)
183
 
        trans = tree1.branch.repository.bzrdir.get_repository_transport(None)
 
183
        trans = tree1.branch.repository.controldir.get_repository_transport(None)
184
184
        self.assertEqual([],
185
185
            list(self.index_class(trans, 'pack-names', None).iter_all_entries()))
186
186
 
187
187
    def test_commit_across_pack_shape_boundary_autopacks(self):
188
188
        format = self.get_format()
189
189
        tree = self.make_branch_and_tree('.', format=format)
190
 
        trans = tree.branch.repository.bzrdir.get_repository_transport(None)
 
190
        trans = tree.branch.repository.controldir.get_repository_transport(None)
191
191
        # This test could be a little cheaper by replacing the packs
192
192
        # attribute on the repository to allow a different pack distribution
193
193
        # and max packs policy - so we are checking the policy is honoured
206
206
        index = self.index_class(trans, 'pack-names', None)
207
207
        self.assertEqual(1, len(list(index.iter_all_entries())))
208
208
        # packing should not damage data
209
 
        tree = tree.bzrdir.open_workingtree()
 
209
        tree = tree.controldir.open_workingtree()
210
210
        check_result = tree.branch.repository.check(
211
211
            [tree.branch.last_revision()])
212
212
        nb_files = 5 # .pack, .rix, .iix, .tix, .six
299
299
    def test_pack_after_two_commits_packs_everything(self):
300
300
        format = self.get_format()
301
301
        tree = self.make_branch_and_tree('.', format=format)
302
 
        trans = tree.branch.repository.bzrdir.get_repository_transport(None)
 
302
        trans = tree.branch.repository.controldir.get_repository_transport(None)
303
303
        tree.commit('start')
304
304
        tree.commit('more work')
305
305
        tree.branch.repository.pack()
348
348
        # tip->ancestor
349
349
        format = self.get_format()
350
350
        tree = self.make_branch_and_tree('.', format=format)
351
 
        trans = tree.branch.repository.bzrdir.get_repository_transport(None)
 
351
        trans = tree.branch.repository.controldir.get_repository_transport(None)
352
352
        tree.commit('start', rev_id='1')
353
353
        tree.commit('more work', rev_id='2')
354
354
        tree.branch.repository.pack()
783
783
        key = ('sha1:' + osutils.sha_string(text),)
784
784
        repo.chk_bytes.add_lines(key, (), [text])
785
785
        wg_tokens = repo.suspend_write_group()
786
 
        same_repo = repo.bzrdir.open_repository()
 
786
        same_repo = repo.controldir.open_repository()
787
787
        same_repo.lock_write()
788
788
        self.addCleanup(same_repo.unlock)
789
789
        same_repo.resume_write_group(wg_tokens)
804
804
        repo.texts.add_lines(text_key, (), ['lines'])
805
805
        wg_tokens = repo.suspend_write_group()
806
806
        # Get a fresh repository object for the repo on the filesystem.
807
 
        same_repo = repo.bzrdir.open_repository()
 
807
        same_repo = repo.controldir.open_repository()
808
808
        # Resume
809
809
        same_repo.lock_write()
810
810
        self.addCleanup(same_repo.unlock)
824
824
        repo.texts.add_lines(text_key, (), ['lines'])
825
825
        wg_tokens = repo.suspend_write_group()
826
826
        # Get a fresh repository object for the repo on the filesystem.
827
 
        same_repo = repo.bzrdir.open_repository()
 
827
        same_repo = repo.controldir.open_repository()
828
828
        # Resume
829
829
        same_repo.lock_write()
830
830
        self.addCleanup(same_repo.unlock)
872
872
        super(TestPackRepositoryStacking, self).setUp()
873
873
 
874
874
    def get_format(self):
875
 
        return controldir.format_registry.make_bzrdir(self.format_name)
 
875
        return controldir.format_registry.make_controldir(self.format_name)
876
876
 
877
877
    def test_stack_checks_rich_root_compatibility(self):
878
878
        # early versions of the packing code relied on pack internals to
949
949
        referencing.branch.repository.add_fallback_repository(base.branch.repository)
950
950
        local_tree = referencing.branch.create_checkout('local')
951
951
        local_tree.commit('bar')
952
 
        new_instance = referencing.bzrdir.open_repository()
 
952
        new_instance = referencing.controldir.open_repository()
953
953
        new_instance.lock_read()
954
954
        self.addCleanup(new_instance.unlock)
955
955
        new_instance._pack_collection.ensure_loaded()
961
961
        base.commit('foo')
962
962
        tree = self.make_branch_and_tree('repo', format=format)
963
963
        tree.branch.repository.add_fallback_repository(base.branch.repository)
964
 
        trans = tree.branch.repository.bzrdir.get_repository_transport(None)
 
964
        trans = tree.branch.repository.controldir.get_repository_transport(None)
965
965
        # This test could be a little cheaper by replacing the packs
966
966
        # attribute on the repository to allow a different pack distribution
967
967
        # and max packs policy - so we are checking the policy is honoured
978
978
        index = self.index_class(trans, 'pack-names', None)
979
979
        self.assertEqual(1, len(list(index.iter_all_entries())))
980
980
        # packing should not damage data
981
 
        tree = tree.bzrdir.open_workingtree()
 
981
        tree = tree.controldir.open_workingtree()
982
982
        check_result = tree.branch.repository.check(
983
983
            [tree.branch.last_revision()])
984
984
        nb_files = 5 # .pack, .rix, .iix, .tix, .six
1003
1003
class TestKeyDependencies(TestCaseWithTransport):
1004
1004
 
1005
1005
    def get_format(self):
1006
 
        return controldir.format_registry.make_bzrdir(self.format_name)
 
1006
        return controldir.format_registry.make_controldir(self.format_name)
1007
1007
 
1008
1008
    def create_source_and_target(self):
1009
1009
        builder = self.make_branch_builder('source', format=self.get_format())
1088
1088
        self.hpss_calls.append(params.method)
1089
1089
 
1090
1090
    def get_format(self):
1091
 
        return controldir.format_registry.make_bzrdir(self.format_name)
 
1091
        return controldir.format_registry.make_controldir(self.format_name)
1092
1092
 
1093
1093
    def test_autopack_or_streaming_rpc_is_used_when_using_hpss(self):
1094
1094
        # Make local and remote repos