← 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: Canonical.com Patch Queue Manager
  • Date: 2011-05-16 16:40:50 UTC
  • mfrom: (5863.2.5 433734-docs-licence)
  • Revision ID: pqm@pqm.ubuntu.com-20110516164050-frzpzaz8l2v33b6k
(mbp) add licence to documentation files (Jonathan Riddell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remove.py
20
20
 
21
21
from bzrlib.tests import (
22
22
    script,
23
 
    features,
 
23
    SymlinkFeature,
24
24
    TestCaseWithTransport,
25
25
    TestSkipped,
26
26
    )
125
125
        self.assertNotInWorkingTree('bar', tree=tree)
126
126
 
127
127
    def test_remove_no_files_specified_missing_link(self):
128
 
        self.requireFeature(features.SymlinkFeature)
 
128
        self.requireFeature(SymlinkFeature)
129
129
        tree = self._make_tree_and_add(['foo'])
130
130
        os.symlink('foo', 'linkname')
131
131
        tree.add(['linkname'])
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'")