← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2008-03-03 16:52:41 UTC
  • mfrom: (3144.3.11 fix-conflict-handling)
  • mto: This revision was merged to the branch mainline in revision 3250.
  • Revision ID: aaron@aaronbentley.com-20080303165241-0k2c7ggs6kr9q6hf
Merge with fix-conflict-handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
305
305
        self.assertContainsRe(out, 'bar')
306
306
        self.assertNotContainsRe(out, 'added:')
307
307
        self.assertNotContainsRe(out, 'foo')
 
308
 
 
309
    def test_pull_quiet(self):
 
310
        """Check that bzr pull --quiet does not print anything"""
 
311
        tree_a = self.make_branch_and_tree('tree_a')
 
312
        self.build_tree(['tree_a/foo'])
 
313
        tree_a.add('foo')
 
314
        revision_id = tree_a.commit('bar')
 
315
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
316
        out, err = self.run_bzr('pull --quiet -d tree_b')
 
317
        self.assertEqual(out, '')
 
318
        self.assertEqual(err, '')
 
319
        self.assertEqual(tree_b.last_revision(), revision_id)
 
320
        self.build_tree(['tree_a/moo'])
 
321
        tree_a.add('moo')
 
322
        revision_id = tree_a.commit('quack')
 
323
        out, err = self.run_bzr('pull --quiet -d tree_b')
 
324
        self.assertEqual(out, '')
 
325
        self.assertEqual(err, '')
 
326
        self.assertEqual(tree_b.last_revision(), revision_id)