← 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: 2007-07-20 08:10:24 UTC
  • mfrom: (2637.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070720081024-5xhlp7r8ufwxt6nf
(Kent Gibson) Update update's help

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remove.py
31
31
 
32
32
class TestRemove(ExternalBase):
33
33
 
34
 
    def run_bzr_captured(self, argv, retcode=0, encoding=None, stdin=None,
35
 
                         working_dir=None):
36
 
 
37
 
        # magically convert commands like 'remove abc' to ['remove', 'abc']
38
 
        if (isinstance(argv, tuple) and len(argv) == 1 and
39
 
            isinstance(argv[0], basestring)):
40
 
            argv = shlex.split(argv[0])
41
 
        return ExternalBase.run_bzr_captured(self, argv, retcode, encoding,
42
 
            stdin, working_dir)
43
 
 
44
34
    def _make_add_and_assert_tree(self, files):
45
35
        tree = self.make_branch_and_tree('.')
46
36
        self.build_tree(files)
74
64
            ' or --force to delete them regardless.'
75
65
            ])
76
66
        self.run_bzr_error(error_regexes,
77
 
            'remove ' + ' '.join(files_to_remove))
 
67
            ['remove'] + list(files_to_remove))
78
68
        #see if we can force it now
79
 
        self.run_bzr('remove --force ' + ' '.join(files_to_remove))
 
69
        self.run_bzr(['remove', '--force'] + list(files_to_remove))
80
70
 
81
71
    def test_remove_no_files_specified(self):
82
72
        tree = self._make_add_and_assert_tree([])
116
106
    def test_remove_invalid_files(self):
117
107
        self.build_tree(files)
118
108
        tree = self.make_branch_and_tree('.')
119
 
        self.run_bzr_remove_changed_files(['unknown:[.\s]*xyz[.\s]*abc/def'],
120
 
            ['.', 'xyz', 'abc/def'])
 
109
        self.run_bzr(['remove', '.', 'xyz', 'abc/def'])
121
110
 
122
111
    def test_remove_unversioned_files(self):
123
112
        self.build_tree(files)
153
142
    def test_remove_force_unversioned_files(self):
154
143
        self.build_tree(files)
155
144
        tree = self.make_branch_and_tree('.')
156
 
        self.run_bzr('remove --force ' + ' '.join(files),
 
145
        self.run_bzr(['remove', '--force'] + list(files),
157
146
                     error_regexes=["deleted a", "deleted b",
158
147
                                    "deleted b/c", "deleted d"])
159
148
        self.assertFilesDeleted(files)
173
162
 
174
163
    def test_remove_non_existing_files(self):
175
164
        tree = self._make_add_and_assert_tree([])
176
 
        self.run_bzr_remove_changed_files(['unknown:[.\s]*b'], ['b'])
 
165
        self.run_bzr(['remove', 'b'])
177
166
 
178
167
    def test_remove_keep_non_existing_files(self):
179
168
        tree = self._make_add_and_assert_tree([])