← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_controldir_colo/test_unsupported.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir_colo/test_unsupported.py
23
23
from bzrlib import (
24
24
    errors,
25
25
    tests,
26
 
    transport,
27
26
    )
28
27
from bzrlib.tests import (
29
28
    per_controldir,
40
39
            # they may not be initializable.
41
40
            raise tests.TestNotApplicable('Control dir format not supported')
42
41
        t = self.get_transport()
43
 
        made_control = self.bzrdir_format.initialize(t.base)
 
42
        try:
 
43
            made_control = self.bzrdir_format.initialize(t.base)
 
44
        except errors.UninitializableFormat:
 
45
            raise tests.TestNotApplicable('Control dir format not initializable')
44
46
        made_repo = made_control.create_repository()
45
47
        return made_control
46
48
 
66
68
        made_control = self.make_bzrdir_with_repo()
67
69
        self.assertRaises(errors.NoColocatedBranchSupport,
68
70
            made_control.get_branch_reference, "colo")
 
71
 
 
72
    def test_get_branches(self):
 
73
        made_control = self.make_bzrdir_with_repo()
 
74
        made_control.create_branch()
 
75
        self.assertEqual(made_control.get_branches().keys(),
 
76
                         [None])