← 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 integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_testament.py
33
33
 
34
34
    def setUp(self):
35
35
        super(TestamentTests, self).setUp()
36
 
        wt = self.make_branch_and_tree('.')
37
 
        b = self.b = wt.branch
 
36
        self.wt = self.make_branch_and_tree('.')
 
37
        b = self.b = self.wt.branch
38
38
        b.nick = "test branch"
39
 
        wt.commit(message='initial null commit',
 
39
        self.wt.commit(message='initial null commit',
40
40
                 committer='test@user',
41
41
                 timestamp=1129025423, # 'Tue Oct 11 20:10:23 2005'
42
42
                 timezone=0,
44
44
        self.build_tree_contents([('hello', 'contents of hello file'),
45
45
                             ('src/', ),
46
46
                             ('src/foo.c', 'int main()\n{\n}\n')])
47
 
        wt.add(['hello', 'src', 'src/foo.c'],
 
47
        self.wt.add(['hello', 'src', 'src/foo.c'],
48
48
                             ['hello-id', 'src-id', 'foo.c-id'])
49
 
        wt.commit(message='add files and directories',
 
49
        self.wt.commit(message='add files and directories',
50
50
                 timestamp=1129025483,
51
51
                 timezone=36000,
52
52
                 rev_id='test@user-2',
96
96
        if not has_symlinks():
97
97
            return
98
98
        os.symlink('wibble/linktarget', 'link')
99
 
        self.b.working_tree().add(['link'], ['link-id'])
100
 
        self.b.working_tree().commit(message='add symlink',
 
99
        self.wt.add(['link'], ['link-id'])
 
100
        self.wt.commit(message='add symlink',
101
101
                 timestamp=1129025493,
102
102
                 timezone=36000,
103
103
                 rev_id='test@user-3',
109
109
        """Testament to revision with extra properties"""
110
110
        props = dict(flavor='sour cherry\ncream cheese',
111
111
                     size='medium')
112
 
        self.b.working_tree().commit(message='revision with properties',
 
112
        self.wt.commit(message='revision with properties',
113
113
                      timestamp=1129025493,
114
114
                      timezone=36000,
115
115
                      rev_id='test@user-3',