← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_info.py

  • Committer: Patch Queue Manager
  • Date: 2012-03-06 19:49:19 UTC
  • mfrom: (6472.2.6 use-bzr-controldir)
  • Revision ID: pqm@pqm.ubuntu.com-20120306194919-kt7mj6xmhifsgees
(jelmer) Use bzrlib.controldir for generic access to control directories,
 rather than bzrlib.bzrdir. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
231
231
        # Branch and bind to standalone, needs upgrade to metadir
232
232
        # (creates backup as unknown)
233
233
        branch1.bzrdir.sprout('bound')
234
 
        knit1_format = bzrdir.format_registry.make_bzrdir('knit')
 
234
        knit1_format = controldir.format_registry.make_bzrdir('knit')
235
235
        upgrade.upgrade('bound', knit1_format)
236
236
        branch3 = controldir.ControlDir.open('bound').open_branch()
237
237
        branch3.bind(branch1)
328
328
        tree5 = branch1.create_checkout('lightcheckout', lightweight=True)
329
329
        branch5 = tree5.branch
330
330
        out, err = self.run_bzr('info -v lightcheckout')
331
 
        if "metaweave" in bzrdir.format_registry:
 
331
        if "metaweave" in controldir.format_registry:
332
332
            format_description = "knit or metaweave"
333
333
        else:
334
334
            format_description = "knit"
546
546
 
547
547
    def test_info_standalone_no_tree(self):
548
548
        # create standalone branch without a working tree
549
 
        format = bzrdir.format_registry.make_bzrdir('default')
 
549
        format = controldir.format_registry.make_bzrdir('default')
550
550
        branch = self.make_branch('branch')
551
551
        repo = branch.repository
552
552
        out, err = self.run_bzr('info branch -v')
575
575
        self.assertEqual('', err)
576
576
 
577
577
    def test_info_shared_repository(self):
578
 
        format = bzrdir.format_registry.make_bzrdir('knit')
 
578
        format = controldir.format_registry.make_bzrdir('knit')
579
579
        transport = self.get_transport()
580
580
 
581
581
        # Create shared repository
871
871
        self.assertEqual('', err)
872
872
 
873
873
    def test_info_shared_repository_with_trees(self):
874
 
        format = bzrdir.format_registry.make_bzrdir('knit')
 
874
        format = controldir.format_registry.make_bzrdir('knit')
875
875
        transport = self.get_transport()
876
876
 
877
877
        # Create shared repository with working trees
1098
1098
        self.assertEqual('', err)
1099
1099
 
1100
1100
    def test_info_shared_repository_with_tree_in_root(self):
1101
 
        format = bzrdir.format_registry.make_bzrdir('knit')
 
1101
        format = controldir.format_registry.make_bzrdir('knit')
1102
1102
        transport = self.get_transport()
1103
1103
 
1104
1104
        # Create shared repository with working trees
1166
1166
        self.assertEqual('', err)
1167
1167
 
1168
1168
    def test_info_repository_hook(self):
1169
 
        format = bzrdir.format_registry.make_bzrdir('knit')
 
1169
        format = controldir.format_registry.make_bzrdir('knit')
1170
1170
        def repo_info(repo, stats, outf):
1171
1171
            outf.write("more info\n")
1172
1172
        info.hooks.install_named_hook('repository', repo_info, None)
1195
1195
        self.assertEqual('', err)
1196
1196
 
1197
1197
    def test_info_unshared_repository_with_colocated_branches(self):
1198
 
        format = bzrdir.format_registry.make_bzrdir('development-colo')
 
1198
        format = controldir.format_registry.make_bzrdir('development-colo')
1199
1199
        transport = self.get_transport()
1200
1200
 
1201
1201
        # Create unshared repository