← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_testament.py

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_testament.py
22
22
from sha import sha
23
23
import sys
24
24
 
25
 
from bzrlib.selftest import TestCaseInTempDir
26
 
from bzrlib.selftest.treeshape import build_tree_contents
 
25
from bzrlib.tests import TestCaseInTempDir
27
26
from bzrlib.branch import Branch
28
27
from bzrlib.testament import Testament
29
28
from bzrlib.trace import mutter
34
33
 
35
34
    def setUp(self):
36
35
        super(TestamentTests, self).setUp()
37
 
        b = self.b = Branch.initialize('.')
 
36
        b = self.b = Branch.initialize(u'.')
38
37
        b.nick = "test branch"
39
38
        b.working_tree().commit(message='initial null commit',
40
39
                 committer='test@user',
41
40
                 timestamp=1129025423, # 'Tue Oct 11 20:10:23 2005'
42
41
                 timezone=0,
43
42
                 rev_id='test@user-1')
44
 
        build_tree_contents([('hello', 'contents of hello file'),
 
43
        self.build_tree_contents([('hello', 'contents of hello file'),
45
44
                             ('src/', ),
46
45
                             ('src/foo.c', 'int main()\n{\n}\n')])
47
46
        b.working_tree().add(['hello', 'src', 'src/foo.c'],