← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_branch.py

  • Committer: Vincent Ladeuil
  • Date: 2012-02-14 17:22:37 UTC
  • mfrom: (6466 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120214172237-7dv7er3n4uy8d5m4
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_branch.py
22
22
    config,
23
23
    delta as _mod_delta,
24
24
    errors,
25
 
    gpg,
26
25
    merge,
27
26
    osutils,
28
27
    urlutils,
318
317
            repo = self.make_repository('.', shared=True)
319
318
        except errors.IncompatibleFormat:
320
319
            return
 
320
        if repo.bzrdir._format.colocated_branches:
 
321
            raise tests.TestNotApplicable(
 
322
                "control dir does not support colocated branches")
321
323
        self.assertEquals(0, len(repo.bzrdir.list_branches()))
 
324
        if not self.bzrdir_format.colocated_branches:
 
325
            raise tests.TestNotApplicable("control dir format does not support "
 
326
                "colocated branches")
322
327
        try:
323
328
            child_branch1 = self.branch_format.initialize(repo.bzrdir, 
324
329
                name='branch1')
325
 
        except (errors.UninitializableFormat, errors.NoColocatedBranchSupport):
 
330
        except errors.UninitializableFormat:
326
331
            # branch references are not default init'able and
327
332
            # not all bzrdirs support colocated branches.
328
333
            return
523
528
            looked_up_format = registry.get(network_name)
524
529
            self.assertEqual(format.__class__, looked_up_format.__class__)
525
530
 
526
 
    def get_get_config_calls(self):
 
531
    def test_get_config_calls(self):
527
532
        # Smoke test that all branch succeed getting a config
528
533
        br = self.make_branch('.')
529
534
        br.get_config()