← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testannotate.py

  • Committer: Robert Collins
  • Date: 2005-10-18 05:26:22 UTC
  • mto: This revision was merged to the branch mainline in revision 1463.
  • Revision ID: robertc@robertcollins.net-20051018052622-653d638c9e26fde4
fix broken tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testannotate.py
31
31
import os
32
32
 
33
33
from bzrlib.branch import Branch
 
34
from bzrlib.clone import copy_branch
34
35
from bzrlib.errors import BzrCommandError
35
36
from bzrlib.osutils import has_symlinks
36
 
from bzrlib.tests import TestCaseWithTransport
 
37
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
37
38
from bzrlib.annotate import annotate_file
38
39
 
39
40
 
40
 
class TestAnnotate(TestCaseWithTransport):
41
 
 
 
41
class TestAnnotate(TestCaseInTempDir):
42
42
    def setUp(self):
43
43
        super(TestAnnotate, self).setUp()
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')
 
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')
53
49
 
54
50
    def test_help_annotate(self):
55
51
        """Annotate command exists"""
61
57
        self.assertEqualDiff(out, '''\
62
58
    1 test@us | my helicopter
63
59
''')
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
 
''')