← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_remove.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_remove.py
85
85
 
86
86
    def test_remove_changed_file(self):
87
87
        """Removal of a changed files must fail."""
88
 
        tree = self.get_committed_tree('a')
 
88
        tree = self.get_committed_tree(['a'])
89
89
        self.build_tree_contents([('a', "some other new content!")])
90
90
        self.assertInWorkingTree('a')
91
91
        err = self.assertRaises(errors.BzrRemoveChangedFilesError, tree.remove,
183
183
        tree.remove('b', keep_files=False)
184
184
        self.assertRemovedAndDeleted('b')
185
185
 
 
186
    def test_remove_changed_ignored_files(self):
 
187
        """Changed ignored files should not be deleted."""
 
188
        files = ['an_ignored_file']
 
189
        tree = self.get_tree(files)
 
190
        tree.add(files)
 
191
        ignores.add_runtime_ignores(["*ignored*"])
 
192
        self.assertInWorkingTree(files)
 
193
        self.assertNotEquals(None, tree.is_ignored(files[0]))
 
194
        err = self.assertRaises(errors.BzrRemoveChangedFilesError, tree.remove,
 
195
            files, keep_files=False)
 
196
        self.assertContainsRe(err.changes_as_text,
 
197
            '(?s)added:.*' + files[0])
 
198
        self.assertInWorkingTree(files)
 
199
 
186
200
    def test_dont_remove_directory_with_unknowns(self):
187
201
        """Directories with unknowns should not be deleted."""
188
202
        directories = ['a/', 'b/', 'c/', 'c/c/']