← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_annotate.py

[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_annotate.py
34
34
from bzrlib.clone import copy_branch
35
35
from bzrlib.errors import BzrCommandError
36
36
from bzrlib.osutils import has_symlinks
37
 
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
 
37
from bzrlib.tests import TestCaseInTempDir, BzrTestBase
38
38
from bzrlib.annotate import annotate_file
39
39
 
40
40
 
41
41
class TestAnnotate(TestCaseInTempDir):
42
42
    def setUp(self):
43
43
        super(TestAnnotate, self).setUp()
44
 
        b = Branch.initialize('.')
 
44
        b = Branch.initialize(u'.')
45
45
        self.build_tree_contents([('hello.txt', 'my helicopter\n'),
46
46
                                  ('nomail.txt', 'nomail\n')])
47
 
        b.add(['hello.txt'])
 
47
        b.working_tree().add(['hello.txt'])
48
48
        b.working_tree().commit('add hello', 
49
49
                                committer='test@user')
50
 
        b.add(['nomail.txt'])
 
50
        b.working_tree().add(['nomail.txt'])
51
51
        b.working_tree().commit('add nomail', committer='no mail')
52
52
 
53
53
    def test_help_annotate(self):