← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2012-08-02 10:38:21 UTC
  • mto: This revision was merged to the branch mainline in revision 6555.
  • Revision ID: jelmer@samba.org-20120802103821-pto2dgacjtmpzl1n
Move color feature into bzrlib.tests.features.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remove.py
216
216
        ''')
217
217
        self.assertFilesDeleted(files)
218
218
 
 
219
    def test_remove_force_unversioned_files(self):
 
220
        self.build_tree(files)
 
221
        tree = self.make_branch_and_tree('.')
 
222
        script.ScriptRunner().run_script(self, '''
 
223
        $ bzr remove --force a b/ b/c d/
 
224
        2>(The --force option is deprecated, rather use --no-backup in future.)
 
225
        2>deleted d
 
226
        2>removed b/c (but kept a copy: b/c.~1~)
 
227
        2>deleted b
 
228
        2>deleted a
 
229
        ''')
 
230
        self.assertFilesDeleted(files)
 
231
 
219
232
    def test_remove_deleted_files(self):
220
233
        tree = self._make_tree_and_add(files)
221
234
        self.run_bzr("commit -m 'added files'")