← 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_supported.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-10 07:46:15 UTC
  • mfrom: (5844 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5845.
  • Revision ID: jelmer@samba.org-20110510074615-eptod049ndjxc4i7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir_colo/test_supported.py
33
33
        branch = self.make_branch('branch')
34
34
        bzrdir = branch.bzrdir
35
35
        colo_branch = bzrdir.create_branch('colo')
36
 
        bzrdir.destroy_branch("colo")
 
36
        try:
 
37
            bzrdir.destroy_branch("colo")
 
38
        except (errors.UnsupportedOperation, errors.TransportNotPossible):
 
39
            raise tests.TestNotApplicable('Format does not support destroying branch')
37
40
        self.assertRaises(errors.NotBranchError, bzrdir.open_branch,
38
41
                          "colo")
39
42
 
52
55
                'Control dir does not support creating new branches.')
53
56
        made_repo = made_control.create_repository()
54
57
        made_branch = made_control.create_branch("colo")
55
 
        self.failUnless(isinstance(made_branch, bzrlib.branch.Branch))
 
58
        self.assertIsInstance(made_branch, bzrlib.branch.Branch)
56
59
        self.assertEqual(made_control, made_branch.bzrdir)