/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

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

Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
 
18
18
"""Black-box tests for brz log."""
19
19
 
 
20
from __future__ import absolute_import
 
21
 
 
22
 
20
23
import os
21
24
 
22
25
from breezy import (
474
477
class TestLogSignatures(TestLog):
475
478
 
476
479
    def test_log_with_signatures(self):
477
 
        self.requireFeature(features.gpgme)
 
480
        self.requireFeature(features.gpg)
478
481
 
479
482
        tree = self.make_linear_branch(format='dirstate-tags')
480
483
 
482
485
        self.assertTrue('signature: no signature' in log)
483
486
 
484
487
    def test_log_without_signatures(self):
485
 
        self.requireFeature(features.gpgme)
 
488
        self.requireFeature(features.gpg)
486
489
 
487
490
        tree = self.make_linear_branch(format='dirstate-tags')
488
491
 
995
998
        self.assertLogRevnos([], ["2", "1"])
996
999
 
997
1000
    def test_log_range_open_begin(self):
998
 
        self.knownFailure("log with ghosts fails. bug #726466")
999
1001
        (stdout, stderr) = self.run_bzr(['log', '-r..2'], retcode=3)
1000
1002
        self.assertEqual(["2", "1"],
1001
1003
                         [r.revno for r in self.get_captured_revisions()])
1002
 
        self.assertEqual("brz: ERROR: Further revision history missing.", stderr)
 
1004
        self.assertEqual("brz: ERROR: Further revision history missing.\n",
 
1005
                stderr)
1003
1006
 
1004
1007
    def test_log_range_open_end(self):
1005
1008
        self.assertLogRevnos(["-r1.."], ["2", "1"])
1006
1009
 
 
1010
 
1007
1011
class TestLogMatch(TestLogWithLogCatcher):
 
1012
 
1008
1013
    def prepare_tree(self):
1009
1014
        tree = self.make_branch_and_tree('')
1010
1015
        self.build_tree(
1013
1018
        tree.commit(message='message1', committer='committer1', authors=['author1'])
1014
1019
        tree.add('goodbye.txt')
1015
1020
        tree.commit(message='message2', committer='committer2', authors=['author2'])
1016
 
    
 
1021
 
1017
1022
    def test_message(self):
1018
1023
        self.prepare_tree()
1019
1024
        self.assertLogRevnos(["-m", "message1"], ["1"])