/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/blackbox/test_remove.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-11 04:08:32 UTC
  • mto: (7143.16.20 even-more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7175.
  • Revision ID: jelmer@jelmer.uk-20181111040832-nsljjynzzwmznf3h
Run autopep8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_remove.py
27
27
from breezy.workingtree import WorkingTree
28
28
from breezy import osutils
29
29
 
30
 
_id=b'-id'
31
 
a='a'
32
 
b='b/'
33
 
c='b/c'
34
 
d='d/'
35
 
files=(a, b, c, d)
 
30
_id = b'-id'
 
31
a = 'a'
 
32
b = 'b/'
 
33
c = 'b/c'
 
34
d = 'd/'
 
35
files = (a, b, c, d)
36
36
 
37
37
 
38
38
class TestRemove(TestCaseWithTransport):
43
43
        try:
44
44
            self.build_tree(paths)
45
45
            for path in paths:
46
 
                file_id=path.replace('/', '_').encode('utf-8') + _id
 
46
                file_id = path.replace('/', '_').encode('utf-8') + _id
47
47
                tree.add(path, file_id)
48
48
        finally:
49
49
            tree.unlock()
51
51
 
52
52
    def assertFilesDeleted(self, files):
53
53
        for f in files:
54
 
            id=f.encode('utf-8')+_id
 
54
            id = f.encode('utf-8') + _id
55
55
            self.assertNotInWorkingTree(f)
56
56
            self.assertPathDoesNotExist(f)
57
57
 
66
66
 
67
67
    def run_bzr_remove_changed_files(self, files_to_remove, working_dir=None):
68
68
        self.run_bzr(['remove'] + list(files_to_remove),
69
 
           working_dir=working_dir)
 
69
                     working_dir=working_dir)
70
70
 
71
71
    def test_remove_new_no_files_specified(self):
72
72
        tree = self.make_branch_and_tree('.')
73
73
        self.run_bzr_error(["brz: ERROR: No matching files."], 'remove --new')
74
 
        self.run_bzr_error(["brz: ERROR: No matching files."], 'remove --new .')
 
74
        self.run_bzr_error(
 
75
            ["brz: ERROR: No matching files."], 'remove --new .')
75
76
 
76
77
    def test_remove_no_files_specified(self):
77
78
        tree = self._make_tree_and_add(['foo'])
218
219
    def test_remove_deleted_files(self):
219
220
        tree = self._make_tree_and_add(files)
220
221
        self.run_bzr("commit -m 'added files'")
221
 
        my_files=[f for f in files]
 
222
        my_files = [f for f in files]
222
223
        my_files.sort(reverse=True)
223
224
        for f in my_files:
224
225
            osutils.delete_any(f)
241
242
        self.run_bzr("commit -m 'added files'")
242
243
        self.run_bzr('remove a b b/c d',
243
244
                     error_regexes=["deleted a", "deleted b", "deleted b/c",
244
 
                     "deleted d"])
 
245
                                    "deleted d"])
245
246
        self.assertFilesDeleted(files)
246
247
 
247
248
    def test_remove_keep_files(self):
249
250
        self.run_bzr("commit -m 'added files'")
250
251
        self.run_bzr('remove --keep a b b/c d',
251
252
                     error_regexes=["removed a", "removed b", "removed b/c",
252
 
                     "removed d"])
 
253
                                    "removed d"])
253
254
        self.assertFilesUnversioned(files)
254
255
 
255
256
    def test_remove_with_new(self):