← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_annotate.py

Merged John Meinel's integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_annotate.py
31
31
import os
32
32
 
33
33
from bzrlib.branch import Branch
34
 
from bzrlib.clone import copy_branch
35
34
from bzrlib.errors import BzrCommandError
36
35
from bzrlib.osutils import has_symlinks
37
 
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
 
36
from bzrlib.tests import TestCaseWithTransport
38
37
from bzrlib.annotate import annotate_file
39
38
 
40
39
 
41
 
class TestAnnotate(TestCaseInTempDir):
 
40
class TestAnnotate(TestCaseWithTransport):
 
41
 
42
42
    def setUp(self):
43
43
        super(TestAnnotate, self).setUp()
44
 
        b = Branch.initialize('.')
45
 
        self.build_tree_contents([('hello.txt', 'my helicopter\n')])
46
 
        b.add(['hello.txt'])
47
 
        b.commit('add hello', 
48
 
                 committer='test@user')
 
44
        wt = self.make_branch_and_tree('.')
 
45
        b = wt.branch
 
46
        self.build_tree_contents([('hello.txt', 'my helicopter\n'),
 
47
                                  ('nomail.txt', 'nomail\n')])
 
48
        wt.add(['hello.txt'])
 
49
        wt.commit('add hello', 
 
50
                                committer='test@user')
 
51
        wt.add(['nomail.txt'])
 
52
        wt.commit('add nomail', committer='no mail')
49
53
 
50
54
    def test_help_annotate(self):
51
55
        """Annotate command exists"""
57
61
        self.assertEqualDiff(out, '''\
58
62
    1 test@us | my helicopter
59
63
''')
 
64
 
 
65
    def test_no_mail(self):
 
66
        out, err = self.run_bzr_captured(['annotate', 'nomail.txt'])
 
67
        self.assertEquals(err, '')
 
68
        self.assertEqualDiff(out, '''\
 
69
    2 no mail | nomail
 
70
''')