← 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 19:08:05 UTC
  • mfrom: (6437.3.20 2.5)
  • mto: This revision was merged to the branch mainline in revision 6450.
  • Revision ID: jelmer@samba.org-20120123190805-hlcuihkt2dep44cw
merge bzr 2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
31
31
    upgrade,
32
32
    urlutils,
33
33
    )
 
34
from bzrlib.tests.matchers import ContainsNoVfsCalls
34
35
from bzrlib.transport import memory
35
36
 
36
37
 
1096
1097
       ), out)
1097
1098
        self.assertEqual('', err)
1098
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
 
1099
1116
    def assertCheckoutStatusOutput(self,
1100
1117
        command_string, lco_tree, shared_repo=None,
1101
1118
        repo_branch=None,
1255
1272
        # Do a light checkout of the heavy one
1256
1273
        transport.mkdir('tree/lightcheckout')
1257
1274
        lco_dir = bzrdir.BzrDirMetaFormat1().initialize('tree/lightcheckout')
1258
 
        branch.BranchReferenceFormat().initialize(lco_dir,
1259
 
            target_branch=co_branch)
 
1275
        lco_dir.set_branch_reference(co_branch)
1260
1276
        lco_dir.create_workingtree()
1261
1277
        lco_tree = lco_dir.open_workingtree()
1262
1278
 
1443
1459
        # become necessary for this use case. Please do not adjust this number
1444
1460
        # upwards without agreement from bzr's network support maintainers.
1445
1461
        self.assertLength(12, self.hpss_calls)
 
1462
        self.assertLength(1, self.hpss_connections)
 
1463
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
1446
1464
 
1447
1465
    def test_verbose_branch_info(self):
1448
1466
        self.setup_smart_server_with_call_log()
1458
1476
        # become necessary for this use case. Please do not adjust this number
1459
1477
        # upwards without agreement from bzr's network support maintainers.
1460
1478
        self.assertLength(16, self.hpss_calls)
 
1479
        self.assertLength(1, self.hpss_connections)
 
1480
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)