← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: INADA Naoki
  • Date: 2011-05-17 00:45:09 UTC
  • mfrom: (5875 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5891.
  • Revision ID: songofacandy@gmail.com-20110517004509-q58negjbdjh7t6u1
merge from lp:bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
29
29
    )
30
30
from bzrlib.tests import (
31
31
    test_log,
32
 
    features,
33
32
    )
34
33
 
35
34
 
76
75
                self.log_catcher = test_log.LogCatcher(*args, **kwargs)
77
76
                # Always return our own log formatter
78
77
                return self.log_catcher
79
 
        # Break cycle with closure over self on cleanup by removing method
80
 
        self.addCleanup(setattr, MyLogFormatter, "__new__", None)
81
78
 
82
79
        def getme(branch):
83
80
                # Always return our own log formatter class hijacking the
443
440
        self.assertContainsRe(log, r'tags: tag1')
444
441
 
445
442
 
446
 
class TestLogSignatures(TestLog):
447
 
 
448
 
    def test_log_with_signatures(self):
449
 
        self.requireFeature(features.gpgme)
450
 
 
451
 
        tree = self.make_linear_branch(format='dirstate-tags')
452
 
 
453
 
        log = self.run_bzr("log --signatures")[0]
454
 
        self.assertTrue('signature: no signature' in log)
455
 
 
456
 
    def test_log_without_signatures(self):
457
 
        self.requireFeature(features.gpgme)
458
 
 
459
 
        tree = self.make_linear_branch(format='dirstate-tags')
460
 
 
461
 
        log = self.run_bzr("log")[0]
462
 
        self.assertFalse('signature: no signature' in log)
463
 
 
464
 
 
465
443
class TestLogVerbose(TestLog):
466
444
 
467
445
    def setUp(self):
483
461
    def test_log_short_verbose(self):
484
462
        self.assertUseShortDeltaFormat(['log', '--short', '-v'])
485
463
 
486
 
    def test_log_s_verbose(self):
487
 
        self.assertUseShortDeltaFormat(['log', '-S', '-v'])
488
 
 
489
464
    def test_log_short_verbose_verbose(self):
490
465
        self.assertUseLongDeltaFormat(['log', '--short', '-vv'])
491
466