← 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

(jelmer) Merge colocated branch support back into the 2a format. (Jelmer
 Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_branch.py
318
318
            repo = self.make_repository('.', shared=True)
319
319
        except errors.IncompatibleFormat:
320
320
            return
 
321
        if repo.bzrdir._format.colocated_branches:
 
322
            raise tests.TestNotApplicable(
 
323
                "control dir does not support colocated branches")
321
324
        self.assertEquals(0, len(repo.bzrdir.list_branches()))
 
325
        if not self.bzrdir_format.colocated_branches:
 
326
            raise tests.TestNotApplicable("control dir format does not support "
 
327
                "colocated branches")
322
328
        try:
323
329
            child_branch1 = self.branch_format.initialize(repo.bzrdir, 
324
330
                name='branch1')
325
 
        except (errors.UninitializableFormat, errors.NoColocatedBranchSupport):
 
331
        except errors.UninitializableFormat:
326
332
            # branch references are not default init'able and
327
333
            # not all bzrdirs support colocated branches.
328
334
            return