← 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 Vernooij
  • Date: 2012-01-23 15:02:51 UTC
  • mfrom: (6437.3.19 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120123150251-skmauxb1q7h6w31t
Merge 2.5 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
1097
1097
       ), out)
1098
1098
        self.assertEqual('', err)
1099
1099
 
 
1100
    def test_info_unshared_repository_with_colocated_branches(self):
 
1101
        format = bzrdir.format_registry.make_bzrdir('development-colo')
 
1102
        transport = self.get_transport()
 
1103
 
 
1104
        # Create unshared repository
 
1105
        repo = self.make_repository('repo', shared=False, format=format)
 
1106
        repo.set_make_working_trees(True)
 
1107
        repo.bzrdir.create_branch(name='foo')
 
1108
        out, err = self.run_bzr('info repo')
 
1109
        self.assertEqualDiff(
 
1110
"""Unshared repository with trees and colocated branches (format: development-colo)
 
1111
Location:
 
1112
  repository: repo
 
1113
""", out)
 
1114
        self.assertEqual('', err)
 
1115
 
1100
1116
    def assertCheckoutStatusOutput(self,
1101
1117
        command_string, lco_tree, shared_repo=None,
1102
1118
        repo_branch=None,
1256
1272
        # Do a light checkout of the heavy one
1257
1273
        transport.mkdir('tree/lightcheckout')
1258
1274
        lco_dir = bzrdir.BzrDirMetaFormat1().initialize('tree/lightcheckout')
1259
 
        branch.BranchReferenceFormat().initialize(lco_dir,
1260
 
            target_branch=co_branch)
 
1275
        lco_dir.set_branch_reference(co_branch)
1261
1276
        lco_dir.create_workingtree()
1262
1277
        lco_tree = lco_dir.open_workingtree()
1263
1278