← 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: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

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
 
    SymlinkFeature,
 
23
    features,
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(SymlinkFeature)
 
128
        self.requireFeature(features.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
 
 
232
219
    def test_remove_deleted_files(self):
233
220
        tree = self._make_tree_and_add(files)
234
221
        self.run_bzr("commit -m 'added files'")