← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_pack_repository.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_pack_repository.py
24
24
from bzrlib.btree_index import BTreeGraphIndex
25
25
from bzrlib.index import GraphIndex
26
26
from bzrlib import (
27
 
    bzrdir,
 
27
    controldir,
28
28
    errors,
29
29
    inventory,
30
30
    osutils,
59
59
    """
60
60
 
61
61
    def get_format(self):
62
 
        return bzrdir.format_registry.make_bzrdir(self.format_name)
 
62
        return controldir.format_registry.make_bzrdir(self.format_name)
63
63
 
64
64
    def test_attribute__fetch_order(self):
65
65
        """Packs do not need ordered data retrieval."""
869
869
        super(TestPackRepositoryStacking, self).setUp()
870
870
 
871
871
    def get_format(self):
872
 
        return bzrdir.format_registry.make_bzrdir(self.format_name)
 
872
        return controldir.format_registry.make_bzrdir(self.format_name)
873
873
 
874
874
    def test_stack_checks_rich_root_compatibility(self):
875
875
        # early versions of the packing code relied on pack internals to
1000
1000
class TestKeyDependencies(TestCaseWithTransport):
1001
1001
 
1002
1002
    def get_format(self):
1003
 
        return bzrdir.format_registry.make_bzrdir(self.format_name)
 
1003
        return controldir.format_registry.make_bzrdir(self.format_name)
1004
1004
 
1005
1005
    def create_source_and_target(self):
1006
1006
        builder = self.make_branch_builder('source', format=self.get_format())
1085
1085
        self.hpss_calls.append(params.method)
1086
1086
 
1087
1087
    def get_format(self):
1088
 
        return bzrdir.format_registry.make_bzrdir(self.format_name)
 
1088
        return controldir.format_registry.make_bzrdir(self.format_name)
1089
1089
 
1090
1090
    def test_autopack_or_streaming_rpc_is_used_when_using_hpss(self):
1091
1091
        # Make local and remote repos
1093
1093
        tree = self.make_branch_and_tree('local', format=format)
1094
1094
        self.make_branch_and_tree('remote', format=format)
1095
1095
        remote_branch_url = self.smart_server.get_url() + 'remote'
1096
 
        remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
 
1096
        remote_branch = controldir.ControlDir.open(remote_branch_url).open_branch()
1097
1097
        # Make 9 local revisions, and push them one at a time to the remote
1098
1098
        # repo to produce 9 pack files.
1099
1099
        for x in range(9):