← 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: 2011-10-06 08:34:03 UTC
  • mfrom: (6191.2.1 843900-url-nameerror)
  • Revision ID: pqm@pqm.ubuntu.com-20111006083403-jnsw0exlirg01aed
(mbp) error message without traceback on invalid ubuntu/debian url (bug
 843900) (Martin Pool)

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,
26
25
    errors,
27
26
    info,
28
27
    osutils,
188
187
        branch1.bzrdir.sprout('bound')
189
188
        knit1_format = bzrdir.format_registry.make_bzrdir('knit')
190
189
        upgrade.upgrade('bound', knit1_format)
191
 
        branch3 = controldir.ControlDir.open('bound').open_branch()
 
190
        branch3 = bzrdir.BzrDir.open('bound').open_branch()
192
191
        branch3.bind(branch1)
193
192
        bound_tree = branch3.bzrdir.open_workingtree()
194
193
        out, err = self.run_bzr('info -v bound')
233
232
        self.assertEqual('', err)
234
233
 
235
234
        # Checkout standalone (same as above, but does not have parent set)
236
 
        branch4 = controldir.ControlDir.create_branch_convenience('checkout',
 
235
        branch4 = bzrdir.BzrDir.create_branch_convenience('checkout',
237
236
            format=knit1_format)
238
237
        branch4.bind(branch1)
239
238
        branch4.bzrdir.open_workingtree().update()
530
529
 
531
530
        # Create branch inside shared repository
532
531
        repo.bzrdir.root_transport.mkdir('branch')
533
 
        branch1 = controldir.ControlDir.create_branch_convenience(
534
 
            'repo/branch', format=format)
 
532
        branch1 = repo.bzrdir.create_branch_convenience('repo/branch',
 
533
            format=format)
535
534
        out, err = self.run_bzr('info -v repo/branch')
536
535
        self.assertEqualDiff(
537
536
"""Repository branch (format: dirstate or knit)
804
803
 
805
804
        # Create two branches
806
805
        repo.bzrdir.root_transport.mkdir('branch1')
807
 
        branch1 = controldir.ControlDir.create_branch_convenience('repo/branch1',
 
806
        branch1 = repo.bzrdir.create_branch_convenience('repo/branch1',
808
807
            format=format)
809
808
        branch2 = branch1.bzrdir.sprout('repo/branch2').open_branch()
810
809
 
1222
1221
                                    format=bzrdir.BzrDirMetaFormat1())
1223
1222
        repo.set_make_working_trees(False)
1224
1223
        repo.bzrdir.root_transport.mkdir('branch')
1225
 
        repo_branch = controldir.ControlDir.create_branch_convenience(
1226
 
            'repo/branch', format=bzrdir.BzrDirMetaFormat1())
 
1224
        repo_branch = repo.bzrdir.create_branch_convenience('repo/branch',
 
1225
                                    format=bzrdir.BzrDirMetaFormat1())
1227
1226
        # Do a heavy checkout
1228
1227
        transport.mkdir('tree')
1229
1228
        transport.mkdir('tree/checkout')
1230
 
        co_branch = controldir.ControlDir.create_branch_convenience(
1231
 
            'tree/checkout', format=bzrdir.BzrDirMetaFormat1())
 
1229
        co_branch = bzrdir.BzrDir.create_branch_convenience('tree/checkout',
 
1230
            format=bzrdir.BzrDirMetaFormat1())
1232
1231
        co_branch.bind(repo_branch)
1233
1232
        # Do a light checkout of the heavy one
1234
1233
        transport.mkdir('tree/lightcheckout')