/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_testament.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_testament.py
38
38
    def setUp(self):
39
39
        super(TestamentSetup, self).setUp()
40
40
        self.wt = self.make_branch_and_tree('.', format='development-subtree')
41
 
        self.wt.set_root_id(b'TREE_ROT')
 
41
        self.wt.set_root_id('TREE_ROT')
42
42
        b = self.b = self.wt.branch
43
43
        b.nick = "test branch"
44
44
        self.wt.commit(message='initial null commit',
45
45
                 committer='test@user',
46
46
                 timestamp=1129025423, # 'Tue Oct 11 20:10:23 2005'
47
47
                 timezone=0,
48
 
                 rev_id=b'test@user-1')
49
 
        self.build_tree_contents([('hello', b'contents of hello file'),
 
48
                 rev_id='test@user-1')
 
49
        self.build_tree_contents([('hello', 'contents of hello file'),
50
50
                             ('src/', ),
51
 
                             ('src/foo.c', b'int main()\n{\n}\n')])
 
51
                             ('src/foo.c', 'int main()\n{\n}\n')])
52
52
        self.wt.add(['hello', 'src', 'src/foo.c'],
53
 
                             [b'hello-id', b'src-id', b'foo.c-id'])
 
53
                             ['hello-id', 'src-id', 'foo.c-id'])
54
54
        tt = TreeTransform(self.wt)
55
55
        trans_id = tt.trans_id_tree_path('hello')
56
56
        tt.set_executability(True, trans_id)
58
58
        self.wt.commit(message='add files and directories',
59
59
                 timestamp=1129025483,
60
60
                 timezone=36000,
61
 
                 rev_id=b'test@user-2',
 
61
                 rev_id='test@user-2',
62
62
                 committer='test@user')
63
63
 
64
64
 
106
106
        """Testament containing symlink (where possible)"""
107
107
        self.requireFeature(SymlinkFeature)
108
108
        os.symlink('wibble/linktarget', 'link')
109
 
        self.wt.add(['link'], [b'link-id'])
 
109
        self.wt.add(['link'], ['link-id'])
110
110
        self.wt.commit(message='add symlink',
111
111
                 timestamp=1129025493,
112
112
                 timezone=36000,
113
 
                 rev_id=b'test@user-3',
 
113
                 rev_id='test@user-3',
114
114
                 committer='test@user')
115
115
        t = self.from_revision(self.b.repository, 'test@user-3')
116
 
        self.assertEqualDiff(t.as_text(), self.expected(b'rev_3'))
 
116
        self.assertEqualDiff(t.as_text(), self.expected('rev_3'))
117
117
 
118
118
    def test_testament_revprops(self):
119
119
        """Testament to revision with extra properties"""
124
124
        self.wt.commit(message='revision with properties',
125
125
                      timestamp=1129025493,
126
126
                      timezone=36000,
127
 
                      rev_id=b'test@user-3',
 
127
                      rev_id='test@user-3',
128
128
                      committer='test@user',
129
129
                      revprops=props)
130
130
        t = self.from_revision(self.b.repository, 'test@user-3')
135
135
            message=u'non-ascii commit \N{COPYRIGHT SIGN} me',
136
136
            timestamp=1129025493,
137
137
            timezone=36000,
138
 
            rev_id=b'test@user-3',
 
138
            rev_id='test@user-3',
139
139
            committer=u'Erik B\xe5gfors <test@user>',
140
140
            revprops={'uni':u'\xb5'}
141
141
            )