← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_remove_tree.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remove_tree.py
109
109
    def test_remove_tree_remote_path(self):
110
110
        # TODO: I can't think of a way to implement this...
111
111
        pass
 
112
 
 
113
    def test_remove_tree_uncommitted_changes(self):
 
114
        self.build_tree(['branch1/bar'])
 
115
        self.tree.add('bar')
 
116
        output = self.run_bzr_error(["Working tree .* has uncommitted changes"],
 
117
                                    'remove-tree branch1', retcode=3)
 
118
 
 
119
    def test_remove_tree_uncommitted_changes_force(self):
 
120
        self.build_tree(['branch1/bar'])
 
121
        self.tree.add('bar')
 
122
        self.run_bzr('remove-tree branch1 --force')
 
123
        self.failIfExists('branch1/foo')
 
124
        self.failUnlessExists('branch1/bar')