/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/per_interbranch/test_pull.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-04 17:22:07 UTC
  • mfrom: (6874.1.3 user-url)
  • Revision ID: breezy.the.bot@gmail.com-20180304172207-9odoa6cw3ctkbwjn
Consistently use Branch.user_url when referring to branch location.

Merged from https://code.launchpad.net/~jelmer/brz/user-url/+merge/340567

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_interbranch/test_pull.py
21
21
from breezy import errors
22
22
from breezy.memorytree import MemoryTree
23
23
from breezy.revision import NULL_REVISION
 
24
from breezy.tests import TestNotApplicable
24
25
from breezy.tests.per_interbranch import TestCaseWithInterBranch
25
26
 
26
27
 
77
78
        other = self.sprout_to(master_tree.branch.controldir, 'other').open_branch()
78
79
        # move the branch out of the way on disk to cause a connection
79
80
        # error.
80
 
        master_tree.branch.controldir.destroy_branch()
 
81
        try:
 
82
            master_tree.branch.controldir.destroy_branch()
 
83
        except errors.UnsupportedOperation:
 
84
            raise TestNotApplicable(
 
85
                'control format does not support destroying default branch')
81
86
        # try to pull, which should raise a BoundBranchConnectionFailure.
82
87
        self.assertRaises(errors.BoundBranchConnectionFailure,
83
88
                          checkout.branch.pull, other)