← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_testament.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-03 07:18:36 UTC
  • mto: (5008.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5009.
  • Revision ID: v.ladeuil+lp@free.fr-20100203071836-u9b86q68fr9ri5s6
Fix NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_testament.py
1
 
# Copyright (C) 2005 by Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Test testaments for gpg signing."""
18
18
 
19
19
# TODO: Testaments with x-bits
20
20
 
21
21
import os
22
 
from sha import sha
23
 
import sys
24
22
 
25
 
from bzrlib.tests import TestCaseWithTransport
26
 
from bzrlib.branch import Branch
27
 
from bzrlib.testament import Testament, StrictTestament
28
 
from bzrlib.trace import mutter
 
23
from bzrlib import osutils
 
24
from bzrlib.tests import SymlinkFeature, TestCaseWithTransport
 
25
from bzrlib.testament import Testament, StrictTestament, StrictTestament3
29
26
from bzrlib.transform import TreeTransform
30
 
from bzrlib.osutils import has_symlinks
31
 
 
32
 
 
33
 
class TestamentTests(TestCaseWithTransport):
 
27
 
 
28
 
 
29
class TestamentSetup(TestCaseWithTransport):
34
30
 
35
31
    def setUp(self):
36
 
        super(TestamentTests, self).setUp()
37
 
        self.wt = self.make_branch_and_tree('.')
 
32
        super(TestamentSetup, self).setUp()
 
33
        self.wt = self.make_branch_and_tree('.', format='dirstate-with-subtree')
 
34
        self.wt.set_root_id('TREE_ROT')
38
35
        b = self.b = self.wt.branch
39
36
        b.nick = "test branch"
40
37
        self.wt.commit(message='initial null commit',
57
54
                 rev_id='test@user-2',
58
55
                 committer='test@user')
59
56
 
 
57
 
 
58
class TestamentTests(TestamentSetup):
 
59
 
 
60
    def testament_class(self):
 
61
        return Testament
 
62
 
 
63
    def expected(self, key):
 
64
        return texts[self.testament_class()][key]
 
65
 
 
66
    def from_revision(self, repository, revision_id):
 
67
        return self.testament_class().from_revision(repository, revision_id)
 
68
 
60
69
    def test_null_testament(self):
61
70
        """Testament for a revision with no contents."""
62
 
        t = Testament.from_revision(self.b.repository, 'test@user-1')
 
71
        t = self.from_revision(self.b.repository, 'test@user-1')
63
72
        ass = self.assertTrue
64
73
        eq = self.assertEqual
65
74
        ass(isinstance(t, Testament))
70
79
 
71
80
    def test_testment_text_form(self):
72
81
        """Conversion of testament to canonical text form."""
73
 
        t = Testament.from_revision(self.b.repository, 'test@user-1')
74
 
        text_form = t.as_text()
75
 
        self.log('testament text form:\n' + text_form)
76
 
        self.assertEqual(text_form, REV_1_TESTAMENT)
77
 
 
78
 
    def test_strict_testment_text_form(self):
79
 
        """Conversion of testament to canonical text form."""
80
 
        t = StrictTestament.from_revision(self.b.repository, 'test@user-1')
81
 
        text_form = t.as_text()
82
 
        self.log('testament text form:\n' + text_form)
83
 
        self.assertEqualDiff(text_form, REV_1_STRICT_TESTAMENT)
 
82
        t = self.from_revision(self.b.repository, 'test@user-1')
 
83
        text_form = t.as_text()
 
84
        self.log('testament text form:\n' + text_form)
 
85
        self.assertEqualDiff(text_form, self.expected('rev_1'))
 
86
        short_text_form = t.as_short_text()
 
87
        self.assertEqualDiff(short_text_form, self.expected('rev_1_short'))
84
88
 
85
89
    def test_testament_with_contents(self):
86
90
        """Testament containing a file and a directory."""
87
 
        t = Testament.from_revision(self.b.repository, 'test@user-2')
88
 
        text_form = t.as_text()
89
 
        self.log('testament text form:\n' + text_form)
90
 
        self.assertEqualDiff(text_form, REV_2_TESTAMENT)
91
 
        actual_short = t.as_short_text()
92
 
        self.assertEqualDiff(actual_short, REV_2_SHORT)
93
 
 
94
 
    def test_strict_testament_with_contents(self):
95
 
        """Testament containing a file and a directory."""
96
 
        t = StrictTestament.from_revision(self.b.repository, 'test@user-2')
97
 
        text_form = t.as_text()
98
 
        self.log('testament text form:\n' + text_form)
99
 
        self.assertEqualDiff(text_form, REV_2_STRICT_TESTAMENT)
100
 
        actual_short = t.as_short_text()
101
 
        self.assertEqualDiff(actual_short, REV_2_SHORT_STRICT)
102
 
 
103
 
    def test_testament_command(self):
104
 
        """Testament containing a file and a directory."""
105
 
        out, err = self.run_bzr_captured(['testament', '--long'])
106
 
        self.assertEqualDiff(err, '')
107
 
        self.assertEqualDiff(out, REV_2_TESTAMENT)
108
 
 
109
 
    def test_testament_command_2(self):
110
 
        """Command getting short testament of previous version."""
111
 
        out, err = self.run_bzr_captured(['testament', '-r1'])
112
 
        self.assertEqualDiff(err, '')
113
 
        self.assertEqualDiff(out, REV_1_SHORT)
114
 
 
115
 
    def test_testament_command_3(self):
116
 
        """Command getting short testament of previous version."""
117
 
        out, err = self.run_bzr_captured(['testament', '-r1', '--strict'])
118
 
        self.assertEqualDiff(err, '')
119
 
        self.assertEqualDiff(out, REV_1_SHORT_STRICT)
 
91
        t = self.from_revision(self.b.repository, 'test@user-2')
 
92
        text_form = t.as_text()
 
93
        self.log('testament text form:\n' + text_form)
 
94
        self.assertEqualDiff(text_form, self.expected('rev_2'))
 
95
        actual_short = t.as_short_text()
 
96
        self.assertEqualDiff(actual_short, self.expected('rev_2_short'))
120
97
 
121
98
    def test_testament_symlinks(self):
122
99
        """Testament containing symlink (where possible)"""
123
 
        if not has_symlinks():
124
 
            return
 
100
        self.requireFeature(SymlinkFeature)
125
101
        os.symlink('wibble/linktarget', 'link')
126
102
        self.wt.add(['link'], ['link-id'])
127
103
        self.wt.commit(message='add symlink',
129
105
                 timezone=36000,
130
106
                 rev_id='test@user-3',
131
107
                 committer='test@user')
132
 
        t = Testament.from_revision(self.b.repository, 'test@user-3')
133
 
        self.assertEqualDiff(t.as_text(), REV_3_TESTAMENT)
 
108
        t = self.from_revision(self.b.repository, 'test@user-3')
 
109
        self.assertEqualDiff(t.as_text(), self.expected('rev_3'))
134
110
 
135
111
    def test_testament_revprops(self):
136
112
        """Testament to revision with extra properties"""
137
113
        props = dict(flavor='sour cherry\ncream cheese',
138
 
                     size='medium')
 
114
                     size='medium',
 
115
                     empty='',
 
116
                    )
139
117
        self.wt.commit(message='revision with properties',
140
118
                      timestamp=1129025493,
141
119
                      timezone=36000,
142
120
                      rev_id='test@user-3',
143
121
                      committer='test@user',
144
122
                      revprops=props)
145
 
        t = Testament.from_revision(self.b.repository, 'test@user-3')
146
 
        self.assertEqualDiff(t.as_text(), REV_PROPS_TESTAMENT)
 
123
        t = self.from_revision(self.b.repository, 'test@user-3')
 
124
        self.assertEqualDiff(t.as_text(), self.expected('rev_props'))
147
125
 
148
126
    def test_testament_unicode_commit_message(self):
149
127
        self.wt.commit(
151
129
            timestamp=1129025493,
152
130
            timezone=36000,
153
131
            rev_id='test@user-3',
154
 
            committer='test@user')
155
 
        t = Testament.from_revision(self.b.repository, 'test@user-3')
 
132
            committer='Erik B\xe5gfors <test@user>',
 
133
            revprops={'uni':u'\xb5'}
 
134
            )
 
135
        t = self.from_revision(self.b.repository, 'test@user-3')
156
136
        self.assertEqualDiff(
157
 
            SAMPLE_UNICODE_TESTAMENT.encode('utf-8'), t.as_text())
 
137
            self.expected('sample_unicode').encode('utf-8'), t.as_text())
158
138
 
159
139
    def test___init__(self):
160
140
        revision = self.b.repository.get_revision('test@user-2')
161
141
        inventory = self.b.repository.get_inventory('test@user-2')
162
 
        testament_1 = Testament(revision, inventory).as_short_text()
163
 
        testament_2 = Testament.from_revision(self.b.repository, 
164
 
                                              'test@user-2').as_short_text()
165
 
        self.assertEqual(testament_1, testament_2)
166
 
                    
 
142
        testament_1 = self.testament_class()(revision, inventory)
 
143
        text_1 = testament_1.as_short_text()
 
144
        text_2 = self.from_revision(self.b.repository,
 
145
                                    'test@user-2').as_short_text()
 
146
        self.assertEqual(text_1, text_2)
 
147
 
 
148
 
 
149
class TestamentTestsStrict(TestamentTests):
 
150
 
 
151
    def testament_class(self):
 
152
        return StrictTestament
 
153
 
 
154
 
 
155
class TestamentTestsStrict2(TestamentTests):
 
156
 
 
157
    def testament_class(self):
 
158
        return StrictTestament3
 
159
 
167
160
 
168
161
REV_1_TESTAMENT = """\
169
162
bazaar-ng testament version 1
180
173
    test branch
181
174
"""
182
175
 
 
176
 
183
177
REV_1_STRICT_TESTAMENT = """\
184
178
bazaar-ng testament version 2.1
185
179
revision-id: test@user-1
196
190
"""
197
191
 
198
192
 
 
193
REV_1_STRICT_TESTAMENT3 = """\
 
194
bazaar testament version 3 strict
 
195
revision-id: test@user-1
 
196
committer: test@user
 
197
timestamp: 1129025423
 
198
timezone: 0
 
199
parents:
 
200
message:
 
201
  initial null commit
 
202
inventory:
 
203
  directory . TREE_ROT test@user-1 no
 
204
properties:
 
205
  branch-nick:
 
206
    test branch
 
207
"""
 
208
 
 
209
 
199
210
REV_1_SHORT = """\
200
211
bazaar-ng testament short form 1
201
212
revision-id: test@user-1
202
213
sha1: %s
203
 
""" % sha(REV_1_TESTAMENT).hexdigest()
 
214
""" % osutils.sha(REV_1_TESTAMENT).hexdigest()
204
215
 
205
216
 
206
217
REV_1_SHORT_STRICT = """\
207
218
bazaar-ng testament short form 2.1
208
219
revision-id: test@user-1
209
220
sha1: %s
210
 
""" % sha(REV_1_STRICT_TESTAMENT).hexdigest()
 
221
""" % osutils.sha(REV_1_STRICT_TESTAMENT).hexdigest()
 
222
 
 
223
 
 
224
REV_1_SHORT_STRICT3 = """\
 
225
bazaar testament short form 3 strict
 
226
revision-id: test@user-1
 
227
sha1: %s
 
228
""" % osutils.sha(REV_1_STRICT_TESTAMENT3).hexdigest()
211
229
 
212
230
 
213
231
REV_2_TESTAMENT = """\
250
268
"""
251
269
 
252
270
 
 
271
REV_2_STRICT_TESTAMENT3 = """\
 
272
bazaar testament version 3 strict
 
273
revision-id: test@user-2
 
274
committer: test@user
 
275
timestamp: 1129025483
 
276
timezone: 36000
 
277
parents:
 
278
  test@user-1
 
279
message:
 
280
  add files and directories
 
281
inventory:
 
282
  directory . TREE_ROT test@user-1 no
 
283
  file hello hello-id 34dd0ac19a24bf80c4d33b5c8960196e8d8d1f73 test@user-2 yes
 
284
  directory src src-id test@user-2 no
 
285
  file src/foo.c foo.c-id a2a049c20f908ae31b231d98779eb63c66448f24 test@user-2 no
 
286
properties:
 
287
  branch-nick:
 
288
    test branch
 
289
"""
 
290
 
 
291
 
253
292
REV_2_SHORT = """\
254
293
bazaar-ng testament short form 1
255
294
revision-id: test@user-2
256
295
sha1: %s
257
 
""" % sha(REV_2_TESTAMENT).hexdigest()
 
296
""" % osutils.sha(REV_2_TESTAMENT).hexdigest()
258
297
 
259
298
 
260
299
REV_2_SHORT_STRICT = """\
261
300
bazaar-ng testament short form 2.1
262
301
revision-id: test@user-2
263
302
sha1: %s
264
 
""" % sha(REV_2_STRICT_TESTAMENT).hexdigest()
 
303
""" % osutils.sha(REV_2_STRICT_TESTAMENT).hexdigest()
 
304
 
 
305
 
 
306
REV_2_SHORT_STRICT3 = """\
 
307
bazaar testament short form 3 strict
 
308
revision-id: test@user-2
 
309
sha1: %s
 
310
""" % osutils.sha(REV_2_STRICT_TESTAMENT3).hexdigest()
265
311
 
266
312
 
267
313
REV_PROPS_TESTAMENT = """\
281
327
properties:
282
328
  branch-nick:
283
329
    test branch
 
330
  empty:
 
331
  flavor:
 
332
    sour cherry
 
333
    cream cheese
 
334
  size:
 
335
    medium
 
336
"""
 
337
 
 
338
 
 
339
REV_PROPS_TESTAMENT_STRICT = """\
 
340
bazaar-ng testament version 2.1
 
341
revision-id: test@user-3
 
342
committer: test@user
 
343
timestamp: 1129025493
 
344
timezone: 36000
 
345
parents:
 
346
  test@user-2
 
347
message:
 
348
  revision with properties
 
349
inventory:
 
350
  file hello hello-id 34dd0ac19a24bf80c4d33b5c8960196e8d8d1f73 test@user-2 yes
 
351
  directory src src-id test@user-2 no
 
352
  file src/foo.c foo.c-id a2a049c20f908ae31b231d98779eb63c66448f24 test@user-2 no
 
353
properties:
 
354
  branch-nick:
 
355
    test branch
 
356
  empty:
 
357
  flavor:
 
358
    sour cherry
 
359
    cream cheese
 
360
  size:
 
361
    medium
 
362
"""
 
363
 
 
364
 
 
365
REV_PROPS_TESTAMENT_STRICT3 = """\
 
366
bazaar testament version 3 strict
 
367
revision-id: test@user-3
 
368
committer: test@user
 
369
timestamp: 1129025493
 
370
timezone: 36000
 
371
parents:
 
372
  test@user-2
 
373
message:
 
374
  revision with properties
 
375
inventory:
 
376
  directory . TREE_ROT test@user-1 no
 
377
  file hello hello-id 34dd0ac19a24bf80c4d33b5c8960196e8d8d1f73 test@user-2 yes
 
378
  directory src src-id test@user-2 no
 
379
  file src/foo.c foo.c-id a2a049c20f908ae31b231d98779eb63c66448f24 test@user-2 no
 
380
properties:
 
381
  branch-nick:
 
382
    test branch
 
383
  empty:
284
384
  flavor:
285
385
    sour cherry
286
386
    cream cheese
310
410
"""
311
411
 
312
412
 
 
413
REV_3_TESTAMENT_STRICT = """\
 
414
bazaar-ng testament version 2.1
 
415
revision-id: test@user-3
 
416
committer: test@user
 
417
timestamp: 1129025493
 
418
timezone: 36000
 
419
parents:
 
420
  test@user-2
 
421
message:
 
422
  add symlink
 
423
inventory:
 
424
  file hello hello-id 34dd0ac19a24bf80c4d33b5c8960196e8d8d1f73 test@user-2 yes
 
425
  symlink link link-id wibble/linktarget test@user-3 no
 
426
  directory src src-id test@user-2 no
 
427
  file src/foo.c foo.c-id a2a049c20f908ae31b231d98779eb63c66448f24 test@user-2 no
 
428
properties:
 
429
  branch-nick:
 
430
    test branch
 
431
"""
 
432
 
 
433
 
 
434
REV_3_TESTAMENT_STRICT3 = """\
 
435
bazaar testament version 3 strict
 
436
revision-id: test@user-3
 
437
committer: test@user
 
438
timestamp: 1129025493
 
439
timezone: 36000
 
440
parents:
 
441
  test@user-2
 
442
message:
 
443
  add symlink
 
444
inventory:
 
445
  directory . TREE_ROT test@user-1 no
 
446
  file hello hello-id 34dd0ac19a24bf80c4d33b5c8960196e8d8d1f73 test@user-2 yes
 
447
  symlink link link-id wibble/linktarget test@user-3 no
 
448
  directory src src-id test@user-2 no
 
449
  file src/foo.c foo.c-id a2a049c20f908ae31b231d98779eb63c66448f24 test@user-2 no
 
450
properties:
 
451
  branch-nick:
 
452
    test branch
 
453
"""
 
454
 
 
455
 
313
456
SAMPLE_UNICODE_TESTAMENT = u"""\
314
457
bazaar-ng testament version 1
315
458
revision-id: test@user-3
316
 
committer: test@user
 
459
committer: Erik B\xe5gfors <test@user>
317
460
timestamp: 1129025493
318
461
timezone: 36000
319
462
parents:
327
470
properties:
328
471
  branch-nick:
329
472
    test branch
330
 
"""
 
473
  uni:
 
474
    \xb5
 
475
"""
 
476
 
 
477
 
 
478
SAMPLE_UNICODE_TESTAMENT_STRICT = u"""\
 
479
bazaar-ng testament version 2.1
 
480
revision-id: test@user-3
 
481
committer: Erik B\xe5gfors <test@user>
 
482
timestamp: 1129025493
 
483
timezone: 36000
 
484
parents:
 
485
  test@user-2
 
486
message:
 
487
  non-ascii commit \N{COPYRIGHT SIGN} me
 
488
inventory:
 
489
  file hello hello-id 34dd0ac19a24bf80c4d33b5c8960196e8d8d1f73 test@user-2 yes
 
490
  directory src src-id test@user-2 no
 
491
  file src/foo.c foo.c-id a2a049c20f908ae31b231d98779eb63c66448f24 test@user-2 no
 
492
properties:
 
493
  branch-nick:
 
494
    test branch
 
495
  uni:
 
496
    \xb5
 
497
"""
 
498
 
 
499
 
 
500
SAMPLE_UNICODE_TESTAMENT_STRICT3 = u"""\
 
501
bazaar testament version 3 strict
 
502
revision-id: test@user-3
 
503
committer: Erik B\xe5gfors <test@user>
 
504
timestamp: 1129025493
 
505
timezone: 36000
 
506
parents:
 
507
  test@user-2
 
508
message:
 
509
  non-ascii commit \N{COPYRIGHT SIGN} me
 
510
inventory:
 
511
  directory . TREE_ROT test@user-1 no
 
512
  file hello hello-id 34dd0ac19a24bf80c4d33b5c8960196e8d8d1f73 test@user-2 yes
 
513
  directory src src-id test@user-2 no
 
514
  file src/foo.c foo.c-id a2a049c20f908ae31b231d98779eb63c66448f24 test@user-2 no
 
515
properties:
 
516
  branch-nick:
 
517
    test branch
 
518
  uni:
 
519
    \xb5
 
520
"""
 
521
 
 
522
 
 
523
texts = {
 
524
    Testament: { 'rev_1': REV_1_TESTAMENT,
 
525
                 'rev_1_short': REV_1_SHORT,
 
526
                 'rev_2': REV_2_TESTAMENT,
 
527
                 'rev_2_short': REV_2_SHORT,
 
528
                 'rev_3': REV_3_TESTAMENT,
 
529
                 'rev_props': REV_PROPS_TESTAMENT,
 
530
                 'sample_unicode': SAMPLE_UNICODE_TESTAMENT,
 
531
    },
 
532
    StrictTestament: {'rev_1': REV_1_STRICT_TESTAMENT,
 
533
                      'rev_1_short': REV_1_SHORT_STRICT,
 
534
                      'rev_2': REV_2_STRICT_TESTAMENT,
 
535
                      'rev_2_short': REV_2_SHORT_STRICT,
 
536
                      'rev_3': REV_3_TESTAMENT_STRICT,
 
537
                      'rev_props': REV_PROPS_TESTAMENT_STRICT,
 
538
                      'sample_unicode': SAMPLE_UNICODE_TESTAMENT_STRICT,
 
539
    },
 
540
    StrictTestament3: {'rev_1': REV_1_STRICT_TESTAMENT3,
 
541
                      'rev_1_short': REV_1_SHORT_STRICT3,
 
542
                      'rev_2': REV_2_STRICT_TESTAMENT3,
 
543
                      'rev_2_short': REV_2_SHORT_STRICT3,
 
544
                      'rev_3': REV_3_TESTAMENT_STRICT3,
 
545
                      'rev_props': REV_PROPS_TESTAMENT_STRICT3,
 
546
                      'sample_unicode': SAMPLE_UNICODE_TESTAMENT_STRICT3,
 
547
    },
 
548
}