← 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: Vincent Ladeuil
  • Date: 2012-03-08 18:30:33 UTC
  • mfrom: (6487 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6488.
  • Revision ID: v.ladeuil+lp@free.fr-20120308183033-bccqnbr1tpozs711
Merge bzr.dev resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
57
57
            '  control directory: ctrl\n')
58
58
        self.assertEquals(err, '')
59
59
 
 
60
    def test_info_empty_controldir_verbose(self):
 
61
        self.make_bzrdir('ctrl')
 
62
        out, err = self.run_bzr('info -v ctrl')
 
63
        self.assertEqualDiff(out,
 
64
            'Empty control directory (format: 2a or pack-0.92)\n'
 
65
            'Location:\n'
 
66
            '  control directory: ctrl\n\n'
 
67
            'Format:\n'
 
68
            '       control: Meta directory format 1\n\n'
 
69
            'Control directory:\n'
 
70
            '         0 branches\n')
 
71
        self.assertEquals(err, '')
 
72
 
60
73
    def test_info_dangling_branch_reference(self):
61
74
        br = self.make_branch('target')
62
75
        br.create_checkout('from', lightweight=True)
218
231
        # Branch and bind to standalone, needs upgrade to metadir
219
232
        # (creates backup as unknown)
220
233
        branch1.bzrdir.sprout('bound')
221
 
        knit1_format = bzrdir.format_registry.make_bzrdir('knit')
 
234
        knit1_format = controldir.format_registry.make_bzrdir('knit')
222
235
        upgrade.upgrade('bound', knit1_format)
223
236
        branch3 = controldir.ControlDir.open('bound').open_branch()
224
237
        branch3.bind(branch1)
315
328
        tree5 = branch1.create_checkout('lightcheckout', lightweight=True)
316
329
        branch5 = tree5.branch
317
330
        out, err = self.run_bzr('info -v lightcheckout')
318
 
        if "metaweave" in bzrdir.format_registry:
 
331
        if "metaweave" in controldir.format_registry:
319
332
            format_description = "knit or metaweave"
320
333
        else:
321
334
            format_description = "knit"
533
546
 
534
547
    def test_info_standalone_no_tree(self):
535
548
        # create standalone branch without a working tree
536
 
        format = bzrdir.format_registry.make_bzrdir('default')
 
549
        format = controldir.format_registry.make_bzrdir('default')
537
550
        branch = self.make_branch('branch')
538
551
        repo = branch.repository
539
552
        out, err = self.run_bzr('info branch -v')
562
575
        self.assertEqual('', err)
563
576
 
564
577
    def test_info_shared_repository(self):
565
 
        format = bzrdir.format_registry.make_bzrdir('knit')
 
578
        format = controldir.format_registry.make_bzrdir('knit')
566
579
        transport = self.get_transport()
567
580
 
568
581
        # Create shared repository
858
871
        self.assertEqual('', err)
859
872
 
860
873
    def test_info_shared_repository_with_trees(self):
861
 
        format = bzrdir.format_registry.make_bzrdir('knit')
 
874
        format = controldir.format_registry.make_bzrdir('knit')
862
875
        transport = self.get_transport()
863
876
 
864
877
        # Create shared repository with working trees
1085
1098
        self.assertEqual('', err)
1086
1099
 
1087
1100
    def test_info_shared_repository_with_tree_in_root(self):
1088
 
        format = bzrdir.format_registry.make_bzrdir('knit')
 
1101
        format = controldir.format_registry.make_bzrdir('knit')
1089
1102
        transport = self.get_transport()
1090
1103
 
1091
1104
        # Create shared repository with working trees
1153
1166
        self.assertEqual('', err)
1154
1167
 
1155
1168
    def test_info_repository_hook(self):
1156
 
        format = bzrdir.format_registry.make_bzrdir('knit')
 
1169
        format = controldir.format_registry.make_bzrdir('knit')
1157
1170
        def repo_info(repo, stats, outf):
1158
1171
            outf.write("more info\n")
1159
1172
        info.hooks.install_named_hook('repository', repo_info, None)
1182
1195
        self.assertEqual('', err)
1183
1196
 
1184
1197
    def test_info_unshared_repository_with_colocated_branches(self):
1185
 
        format = bzrdir.format_registry.make_bzrdir('development-colo')
 
1198
        format = controldir.format_registry.make_bzrdir('development-colo')
1186
1199
        transport = self.get_transport()
1187
1200
 
1188
1201
        # Create unshared repository