/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 bzrlib/tests/blackbox/test_commit.py

  • Committer: John Arbash Meinel
  • Date: 2006-11-02 18:27:24 UTC
  • mto: This revision was merged to the branch mainline in revision 2130.
  • Revision ID: john@arbash-meinel.com-20061102182724-a28db2aff58d51d2
Add commit --strict tests, and add a default ignore so that commit --strict works again

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
322
322
        self.assertNotContainsRe(result, 'file-a')
323
323
        result = self.run_bzr('status')[0]
324
324
        self.assertContainsRe(result, 'removed:\n  file-a')
 
325
 
 
326
    def test_strict_commit(self):
 
327
        """Commit with --strict works if everything is known"""
 
328
        tree = self.make_branch_and_tree('tree')
 
329
        self.build_tree(['tree/a'])
 
330
        tree.add('a')
 
331
        # A simple change should just work
 
332
        self.run_bzr('commit', '--strict', '-m', 'adding a',
 
333
                     working_dir='tree')
 
334
 
 
335
    def test_strict_commit_no_changes(self):
 
336
        """commit --strict gives "no changes" if there is nothing to commit"""
 
337
        tree = self.make_branch_and_tree('tree')
 
338
        self.build_tree(['tree/a'])
 
339
        tree.add('a')
 
340
        tree.commit('adding a')
 
341
 
 
342
        # With no changes, it should just be 'no changes'
 
343
        # Make sure that commit is failing because there is nothing to do
 
344
        self.run_bzr_error(['no changes to commit'],
 
345
                           'commit', '--strict', '-m', 'no changes',
 
346
                           working_dir='tree')
 
347
 
 
348
        # But --strict doesn't care if you supply --unchanged
 
349
        self.run_bzr('commit', '--strict', '--unchanged', '-m', 'no changes',
 
350
                     working_dir='tree')
 
351
 
 
352
    def test_strict_commit_unknown(self):
 
353
        """commit --strict fails if a file is unknown"""
 
354
        tree = self.make_branch_and_tree('tree')
 
355
        self.build_tree(['tree/a'])
 
356
        tree.add('a')
 
357
        tree.commit('adding a')
 
358
 
 
359
        # Add one file so there is a change, but forget the other
 
360
        self.build_tree(['tree/b', 'tree/c'])
 
361
        tree.add('b')
 
362
        self.run_bzr_error(['Commit refused because there are unknown files'],
 
363
                           'commit', '--strict', '-m', 'add b',
 
364
                           working_dir='tree')
 
365
 
 
366
        # --no-strict overrides --strict
 
367
        self.run_bzr('commit', '--strict', '-m', 'add b', '--no-strict',
 
368
                     working_dir='tree')