← 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-06-28 07:08:27 UTC
  • mfrom: (2553.1.3 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070628070827-h5s313dg5tnag9vj
(robertc) Show the names of commit hooks during commit.

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'] + list(files_to_remove))
 
67
            'remove ' + ' '.join(files_to_remove))
68
68
        #see if we can force it now
69
 
        self.run_bzr(['remove', '--force'] + list(files_to_remove))
 
69
        self.run_bzr('remove --force ' + ' '.join(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', '.', 'xyz', 'abc/def'])
 
109
        self.run_bzr_remove_changed_files(['unknown:[.\s]*xyz[.\s]*abc/def'],
 
110
            ['.', 'xyz', 'abc/def'])
110
111
 
111
112
    def test_remove_unversioned_files(self):
112
113
        self.build_tree(files)
142
143
    def test_remove_force_unversioned_files(self):
143
144
        self.build_tree(files)
144
145
        tree = self.make_branch_and_tree('.')
145
 
        self.run_bzr(['remove', '--force'] + list(files),
 
146
        self.run_bzr('remove --force ' + ' '.join(files),
146
147
                     error_regexes=["deleted a", "deleted b",
147
148
                                    "deleted b/c", "deleted d"])
148
149
        self.assertFilesDeleted(files)
162
163
 
163
164
    def test_remove_non_existing_files(self):
164
165
        tree = self._make_add_and_assert_tree([])
165
 
        self.run_bzr(['remove', 'b'])
 
166
        self.run_bzr_remove_changed_files(['unknown:[.\s]*b'], ['b'])
166
167
 
167
168
    def test_remove_keep_non_existing_files(self):
168
169
        tree = self._make_add_and_assert_tree([])