/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/per_workingtree/test_remove.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 23:15:15 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7183.
  • Revision ID: jelmer@jelmer.uk-20181116231515-zqd2yn6kj8lfydyp
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_remove.py
19
19
from breezy.tests.per_workingtree import TestCaseWithWorkingTree
20
20
from breezy import ignores, osutils
21
21
 
 
22
 
22
23
class TestRemove(TestCaseWithWorkingTree):
23
24
    """Tests WorkingTree.remove"""
24
25
 
111
112
        tree = self.get_committed_tree(TestRemove.files)
112
113
 
113
114
        for f in TestRemove.rfiles:
114
 
            tree.rename_one(f, f+'x')
 
115
            tree.rename_one(f, f + 'x')
115
116
        rfilesx = ['bx/cx', 'bx', 'ax', 'dx']
116
117
        self.assertPathExists(rfilesx)
117
118
 
124
125
        tree = self.get_committed_tree(TestRemove.files)
125
126
 
126
127
        for f in TestRemove.rfiles:
127
 
            tree.rename_one(f, f+'x')
 
128
            tree.rename_one(f, f + 'x')
128
129
        rfilesx = ['bx/cx', 'bx', 'ax', 'dx']
129
130
        self.build_tree_contents([('ax', b'changed and renamed!'),
130
131
                                  ('bx/cx', b'changed and renamed!')])
134
135
        self.assertNotInWorkingTree(rfilesx)
135
136
        self.assertPathExists(['bx.~1~/cx.~1~', 'bx.~1~', 'ax.~1~'])
136
137
        if tree.supports_rename_tracking():
137
 
            self.assertPathDoesNotExist('dx.~1~') # unchanged file
 
138
            self.assertPathDoesNotExist('dx.~1~')  # unchanged file
138
139
        else:
139
 
            self.assertPathExists('dx.~1~') # renamed, so appears changed
 
140
            self.assertPathExists('dx.~1~')  # renamed, so appears changed
140
141
        tree._validate()
141
142
 
142
143
    def test_force_remove_changed_files(self):
240
241
        tree = self.get_committed_tree(files)
241
242
 
242
243
        other_files = ['b/unknown_file', 'b/sub_directory/',
243
 
            'b/sub_directory/with_file', 'b/sub_directory/sub_directory/']
 
244
                       'b/sub_directory/with_file', 'b/sub_directory/sub_directory/']
244
245
        self.build_tree(other_files)
245
246
 
246
247
        self.assertInWorkingTree(files)
276
277
    def test_remove_directory_with_changed_emigrated_file(self):
277
278
        # As per bug #129880
278
279
        tree = self.make_branch_and_tree('.')
279
 
        self.build_tree_contents([('somedir/',), (b'somedir/file', b'contents')])
 
280
        self.build_tree_contents(
 
281
            [('somedir/',), (b'somedir/file', b'contents')])
280
282
        tree.add(['somedir', 'somedir/file'])
281
283
        tree.commit(message="first")
282
284
        self.build_tree_contents([('somedir/file', b'changed')])