← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/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/per_workingtree/test_remove.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007-2012, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
173
173
        """Removing a absent directory succeeds without corruption (#150438)."""
174
174
        paths = ['a/', 'a/b']
175
175
        tree = self.get_committed_tree(paths)
176
 
        self.get_transport('.').delete_tree('a')
 
176
        tree.bzrdir.root_transport.delete_tree('a')
177
177
        tree.remove(['a'])
178
178
        self.assertRemovedAndDeleted('b')
179
179
        tree._validate()
184
184
        ignores.add_runtime_ignores(["*ignored*"])
185
185
 
186
186
        self.build_tree(['unknown_ignored_file'])
187
 
        self.assertNotEquals(None, tree.is_ignored('unknown_ignored_file'))
 
187
        self.assertNotEqual(None, tree.is_ignored('unknown_ignored_file'))
188
188
        tree.remove('unknown_ignored_file', keep_files=False)
189
189
        self.assertRemovedAndDeleted('unknown_ignored_file')
190
190
 
191
191
        self.build_tree(['b/unknown_ignored_file', 'b/unknown_ignored_dir/'])
192
 
        self.assertNotEquals(None, tree.is_ignored('b/unknown_ignored_file'))
193
 
        self.assertNotEquals(None, tree.is_ignored('b/unknown_ignored_dir'))
 
192
        self.assertNotEqual(None, tree.is_ignored('b/unknown_ignored_file'))
 
193
        self.assertNotEqual(None, tree.is_ignored('b/unknown_ignored_dir'))
194
194
        tree.remove('b', keep_files=False)
195
195
        self.assertRemovedAndDeleted('b')
196
196
        tree._validate()
202
202
        tree.add(files)
203
203
        ignores.add_runtime_ignores(["*ignored*"])
204
204
        self.assertInWorkingTree(files)
205
 
        self.assertNotEquals(None, tree.is_ignored(files[0]))
 
205
        self.assertNotEqual(None, tree.is_ignored(files[0]))
206
206
 
207
207
        tree.remove(files, keep_files=False)
208
208
        self.assertNotInWorkingTree(files)