← 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: Mark Hammond
  • Date: 2008-12-28 05:21:23 UTC
  • mfrom: (3920 +trunk)
  • mto: (3932.1.1 prepare-1.11)
  • mto: This revision was merged to the branch mainline in revision 3937.
  • Revision ID: mhammond@skippinet.com.au-20081228052123-f78xs5sbdkotshwf
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
340
340
        self.addCleanup(lambda: directories.remove('foo:'))
341
341
        self.run_bzr('pull foo:bar -d target')
342
342
        self.assertEqual(source_last, target.last_revision())
 
343
 
 
344
    def test_pull_verbose_defaults_to_long(self):
 
345
        tree = self.example_branch('source')
 
346
        target = self.make_branch_and_tree('target')
 
347
        out = self.run_bzr('pull -v source -d target')[0]
 
348
        self.assertContainsRe(out,
 
349
                              r'revno: 1\ncommitter: .*\nbranch nick: source')
 
350
        self.assertNotContainsRe(out, r'\n {4}1 .*\n {6}setup\n')
 
351
 
 
352
    def test_pull_verbose_uses_default_log(self):
 
353
        tree = self.example_branch('source')
 
354
        target = self.make_branch_and_tree('target')
 
355
        target_config = target.branch.get_config()
 
356
        target_config.set_user_option('log_format', 'short')
 
357
        out = self.run_bzr('pull -v source -d target')[0]
 
358
        self.assertContainsRe(out, r'\n {4}1 .*\n {6}setup\n')
 
359
        self.assertNotContainsRe(
 
360
            out, r'revno: 1\ncommitter: .*\nbranch nick: source')