/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 bzrlib/tests/test_testament.py

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_testament.py
20
20
 
21
21
import os
22
22
 
23
 
from breezy import osutils
24
 
from breezy.tests import TestCaseWithTransport
25
 
from breezy.testament import (
 
23
from bzrlib import osutils
 
24
from bzrlib.tests import TestCaseWithTransport
 
25
from bzrlib.testament import (
26
26
    Testament,
27
27
    StrictTestament,
28
28
    StrictTestament3,
29
29
    )
30
 
from breezy.transform import TreeTransform
31
 
from breezy.tests.features import (
 
30
from bzrlib.transform import TreeTransform
 
31
from bzrlib.tests.features import (
32
32
    SymlinkFeature,
33
33
    )
34
34
 
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
            )
173
173
        return StrictTestament3
174
174
 
175
175
 
176
 
REV_1_TESTAMENT = b"""\
 
176
REV_1_TESTAMENT = """\
177
177
bazaar-ng testament version 1
178
178
revision-id: test@user-1
179
179
committer: test@user
189
189
"""
190
190
 
191
191
 
192
 
REV_1_STRICT_TESTAMENT = b"""\
 
192
REV_1_STRICT_TESTAMENT = """\
193
193
bazaar-ng testament version 2.1
194
194
revision-id: test@user-1
195
195
committer: test@user
205
205
"""
206
206
 
207
207
 
208
 
REV_1_STRICT_TESTAMENT3 = b"""\
 
208
REV_1_STRICT_TESTAMENT3 = """\
209
209
bazaar testament version 3 strict
210
210
revision-id: test@user-1
211
211
committer: test@user
243
243
""" % osutils.sha_string(REV_1_STRICT_TESTAMENT3)
244
244
 
245
245
 
246
 
REV_2_TESTAMENT = b"""\
 
246
REV_2_TESTAMENT = """\
247
247
bazaar-ng testament version 1
248
248
revision-id: test@user-2
249
249
committer: test@user
263
263
"""
264
264
 
265
265
 
266
 
REV_2_STRICT_TESTAMENT = b"""\
 
266
REV_2_STRICT_TESTAMENT = """\
267
267
bazaar-ng testament version 2.1
268
268
revision-id: test@user-2
269
269
committer: test@user
283
283
"""
284
284
 
285
285
 
286
 
REV_2_STRICT_TESTAMENT3 = b"""\
 
286
REV_2_STRICT_TESTAMENT3 = """\
287
287
bazaar testament version 3 strict
288
288
revision-id: test@user-2
289
289
committer: test@user
325
325
""" % osutils.sha_string(REV_2_STRICT_TESTAMENT3)
326
326
 
327
327
 
328
 
REV_PROPS_TESTAMENT = b"""\
 
328
REV_PROPS_TESTAMENT = """\
329
329
bazaar-ng testament version 1
330
330
revision-id: test@user-3
331
331
committer: test@user
351
351
"""
352
352
 
353
353
 
354
 
REV_PROPS_TESTAMENT_STRICT = b"""\
 
354
REV_PROPS_TESTAMENT_STRICT = """\
355
355
bazaar-ng testament version 2.1
356
356
revision-id: test@user-3
357
357
committer: test@user
377
377
"""
378
378
 
379
379
 
380
 
REV_PROPS_TESTAMENT_STRICT3 = b"""\
 
380
REV_PROPS_TESTAMENT_STRICT3 = """\
381
381
bazaar testament version 3 strict
382
382
revision-id: test@user-3
383
383
committer: test@user
404
404
"""
405
405
 
406
406
 
407
 
REV_3_TESTAMENT = b"""\
 
407
REV_3_TESTAMENT = """\
408
408
bazaar-ng testament version 1
409
409
revision-id: test@user-3
410
410
committer: test@user
425
425
"""
426
426
 
427
427
 
428
 
REV_3_TESTAMENT_STRICT = b"""\
 
428
REV_3_TESTAMENT_STRICT = """\
429
429
bazaar-ng testament version 2.1
430
430
revision-id: test@user-3
431
431
committer: test@user
446
446
"""
447
447
 
448
448
 
449
 
REV_3_TESTAMENT_STRICT3 = b"""\
 
449
REV_3_TESTAMENT_STRICT3 = """\
450
450
bazaar testament version 3 strict
451
451
revision-id: test@user-3
452
452
committer: test@user