← 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: jelmer at samba
  • Date: 2011-10-11 12:01:51 UTC
  • mto: This revision was merged to the branch mainline in revision 6214.
  • Revision ID: jelmer@samba.org-20111011120151-l1aa35zasaocrev3
Fix tests and the like.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
22
22
from bzrlib import (
23
23
    branch,
24
24
    bzrdir,
 
25
    controldir,
25
26
    errors,
26
27
    info,
27
28
    osutils,
187
188
        branch1.bzrdir.sprout('bound')
188
189
        knit1_format = bzrdir.format_registry.make_bzrdir('knit')
189
190
        upgrade.upgrade('bound', knit1_format)
190
 
        branch3 = bzrdir.BzrDir.open('bound').open_branch()
 
191
        branch3 = controldir.ControlDir.open('bound').open_branch()
191
192
        branch3.bind(branch1)
192
193
        bound_tree = branch3.bzrdir.open_workingtree()
193
194
        out, err = self.run_bzr('info -v bound')
232
233
        self.assertEqual('', err)
233
234
 
234
235
        # Checkout standalone (same as above, but does not have parent set)
235
 
        branch4 = bzrdir.BzrDir.create_branch_convenience('checkout',
 
236
        branch4 = controldir.ControlDir.create_branch_convenience('checkout',
236
237
            format=knit1_format)
237
238
        branch4.bind(branch1)
238
239
        branch4.bzrdir.open_workingtree().update()
803
804
 
804
805
        # Create two branches
805
806
        repo.bzrdir.root_transport.mkdir('branch1')
806
 
        branch1 = repo.bzrdir.create_branch_convenience('repo/branch1',
 
807
        branch1 = controldir.ControlDir.create_branch_convenience('repo/branch1',
807
808
            format=format)
808
809
        branch2 = branch1.bzrdir.sprout('repo/branch2').open_branch()
809
810
 
1221
1222
                                    format=bzrdir.BzrDirMetaFormat1())
1222
1223
        repo.set_make_working_trees(False)
1223
1224
        repo.bzrdir.root_transport.mkdir('branch')
1224
 
        repo_branch = repo.bzrdir.create_branch_convenience('repo/branch',
1225
 
                                    format=bzrdir.BzrDirMetaFormat1())
 
1225
        repo_branch = controldir.ControlDir.create_branch_convenience(
 
1226
            'repo/branch', format=bzrdir.BzrDirMetaFormat1())
1226
1227
        # Do a heavy checkout
1227
1228
        transport.mkdir('tree')
1228
1229
        transport.mkdir('tree/checkout')
1229
 
        co_branch = bzrdir.BzrDir.create_branch_convenience('tree/checkout',
 
1230
        co_branch = controldir.Controldir.create_branch_convenience('tree/checkout',
1230
1231
            format=bzrdir.BzrDirMetaFormat1())
1231
1232
        co_branch.bind(repo_branch)
1232
1233
        # Do a light checkout of the heavy one