← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_add.py

merge from dirstate

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
177
177
        self.assertEquals('added spam\n', out)
178
178
        out = self.run_bzr_captured(['added'], retcode=0)[0]
179
179
        self.assertEquals('', out)
 
180
 
 
181
    def test_add_control_dir(self):
 
182
        """The control dir and its content should be refused."""
 
183
        self.make_branch_and_tree('.')
 
184
        err = self.run_bzr('add', '.bzr', retcode=3)[1]
 
185
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
 
186
        err = self.run_bzr('add', '.bzr/README', retcode=3)[1]
 
187
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
 
188
        self.build_tree(['.bzr/crescent'])
 
189
        err = self.run_bzr('add', '.bzr/crescent', retcode=3)[1]
 
190
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')