← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_controldir/test_controldir.py

  • Committer: Vincent Ladeuil
  • Date: 2012-02-01 08:25:41 UTC
  • mfrom: (6437.23.3 2.5)
  • mto: This revision was merged to the branch mainline in revision 6458.
  • Revision ID: v.ladeuil+lp@free.fr-20120201082541-73d2i8rqcjrsx4ds
Merge 2.5 branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir/test_controldir.py
159
159
        bzrdir.create_branch()
160
160
        bzrdir.open_branch()
161
161
 
 
162
    def test_destroy_branch_no_branch(self):
 
163
        branch = self.make_repository('branch')
 
164
        bzrdir = branch.bzrdir
 
165
        try:
 
166
            self.assertRaises(errors.NotBranchError, bzrdir.destroy_branch)
 
167
        except (errors.UnsupportedOperation, errors.TransportNotPossible):
 
168
            raise TestNotApplicable('Format does not support destroying branch')
 
169
 
162
170
    def test_destroy_repository(self):
163
171
        repo = self.make_repository('repository')
164
172
        bzrdir = repo.bzrdir