← 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: Vincent Ladeuil
  • Date: 2007-07-15 11:24:18 UTC
  • mfrom: (2617 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070715112418-9nn4n6esxv60ny4b
merge bzr.dev@1617

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remove.py
64
64
            ' or --force to delete them regardless.'
65
65
            ])
66
66
        self.run_bzr_error(error_regexes,
67
 
            'remove ' + ' '.join(files_to_remove))
 
67
            ['remove'] + list(files_to_remove))
68
68
        #see if we can force it now
69
 
        self.run_bzr('remove --force ' + ' '.join(files_to_remove))
 
69
        self.run_bzr(['remove', '--force'] + list(files_to_remove))
70
70
 
71
71
    def test_remove_no_files_specified(self):
72
72
        tree = self._make_add_and_assert_tree([])
106
106
    def test_remove_invalid_files(self):
107
107
        self.build_tree(files)
108
108
        tree = self.make_branch_and_tree('.')
109
 
        self.run_bzr_remove_changed_files(['unknown:[.\s]*xyz[.\s]*abc/def'],
110
 
            ['.', 'xyz', 'abc/def'])
 
109
        self.run_bzr(['remove', '.', 'xyz', 'abc/def'])
111
110
 
112
111
    def test_remove_unversioned_files(self):
113
112
        self.build_tree(files)
143
142
    def test_remove_force_unversioned_files(self):
144
143
        self.build_tree(files)
145
144
        tree = self.make_branch_and_tree('.')
146
 
        self.run_bzr('remove --force ' + ' '.join(files),
 
145
        self.run_bzr(['remove', '--force'] + list(files),
147
146
                     error_regexes=["deleted a", "deleted b",
148
147
                                    "deleted b/c", "deleted d"])
149
148
        self.assertFilesDeleted(files)
163
162
 
164
163
    def test_remove_non_existing_files(self):
165
164
        tree = self._make_add_and_assert_tree([])
166
 
        self.run_bzr_remove_changed_files(['unknown:[.\s]*b'], ['b'])
 
165
        self.run_bzr(['remove', 'b'])
167
166
 
168
167
    def test_remove_keep_non_existing_files(self):
169
168
        tree = self._make_add_and_assert_tree([])