/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/blackbox/test_remove_tree.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 16:40:42 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610164042-zrxqgy2htyduvke2
Merge rename-controldir branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_remove_tree.py
44
44
        self.assertPathDoesNotExist('branch1/foo')
45
45
 
46
46
    def test_remove_tree_multiple_branch_explicit(self):
47
 
        self.tree.bzrdir.sprout('branch2')
 
47
        self.tree.controldir.sprout('branch2')
48
48
        self.run_bzr('remove-tree branch1 branch2')
49
49
        self.assertPathDoesNotExist('branch1/foo')
50
50
        self.assertPathDoesNotExist('branch2/foo')
51
51
 
52
52
    def test_remove_tree_sprouted_branch(self):
53
 
        self.tree.bzrdir.sprout('branch2')
 
53
        self.tree.controldir.sprout('branch2')
54
54
        self.assertPathExists('branch2/foo')
55
55
        self.run_bzr('remove-tree', working_dir='branch2')
56
56
        self.assertPathDoesNotExist('branch2/foo')
57
57
 
58
58
    def test_remove_tree_sprouted_branch_explicit(self):
59
 
        self.tree.bzrdir.sprout('branch2')
 
59
        self.tree.controldir.sprout('branch2')
60
60
        self.assertPathExists('branch2/foo')
61
61
        self.run_bzr('remove-tree branch2')
62
62
        self.assertPathDoesNotExist('branch2/foo')