← 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: Kit Randel
  • Date: 2014-12-15 20:24:42 UTC
  • mto: This revision was merged to the branch mainline in revision 6602.
  • Revision ID: kit.randel@canonical.com-20141215202442-usf2ixhypqg8yh6q
added a note for bug-1400567 to the 2.7b release notes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_testament.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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
21
21
import os
22
22
 
23
23
from bzrlib import osutils
24
 
from bzrlib.tests import SymlinkFeature, TestCaseWithTransport
25
 
from bzrlib.testament import Testament, StrictTestament, StrictTestament3
 
24
from bzrlib.tests import TestCaseWithTransport
 
25
from bzrlib.testament import (
 
26
    Testament,
 
27
    StrictTestament,
 
28
    StrictTestament3,
 
29
    )
26
30
from bzrlib.transform import TreeTransform
 
31
from bzrlib.tests.features import (
 
32
    SymlinkFeature,
 
33
    )
27
34
 
28
35
 
29
36
class TestamentSetup(TestCaseWithTransport):
30
37
 
31
38
    def setUp(self):
32
39
        super(TestamentSetup, self).setUp()
33
 
        self.wt = self.make_branch_and_tree('.', format='dirstate-with-subtree')
 
40
        self.wt = self.make_branch_and_tree('.', format='development-subtree')
34
41
        self.wt.set_root_id('TREE_ROT')
35
42
        b = self.b = self.wt.branch
36
43
        b.nick = "test branch"
129
136
            timestamp=1129025493,
130
137
            timezone=36000,
131
138
            rev_id='test@user-3',
132
 
            committer='Erik B\xe5gfors <test@user>',
 
139
            committer=u'Erik B\xe5gfors <test@user>',
133
140
            revprops={'uni':u'\xb5'}
134
141
            )
135
142
        t = self.from_revision(self.b.repository, 'test@user-3')
136
143
        self.assertEqualDiff(
137
144
            self.expected('sample_unicode').encode('utf-8'), t.as_text())
138
145
 
 
146
    def test_from_tree(self):
 
147
        tree = self.b.repository.revision_tree('test@user-2')
 
148
        testament = self.testament_class().from_revision_tree(tree)
 
149
        text_1 = testament.as_short_text()
 
150
        text_2 = self.from_revision(self.b.repository,
 
151
                                    'test@user-2').as_short_text()
 
152
        self.assertEqual(text_1, text_2)
 
153
 
139
154
    def test___init__(self):
140
155
        revision = self.b.repository.get_revision('test@user-2')
141
 
        inventory = self.b.repository.get_inventory('test@user-2')
142
 
        testament_1 = self.testament_class()(revision, inventory)
 
156
        tree = self.b.repository.revision_tree('test@user-2')
 
157
        testament_1 = self.testament_class()(revision, tree)
143
158
        text_1 = testament_1.as_short_text()
144
159
        text_2 = self.from_revision(self.b.repository,
145
160
                                    'test@user-2').as_short_text()
211
226
bazaar-ng testament short form 1
212
227
revision-id: test@user-1
213
228
sha1: %s
214
 
""" % osutils.sha(REV_1_TESTAMENT).hexdigest()
 
229
""" % osutils.sha_string(REV_1_TESTAMENT)
215
230
 
216
231
 
217
232
REV_1_SHORT_STRICT = """\
218
233
bazaar-ng testament short form 2.1
219
234
revision-id: test@user-1
220
235
sha1: %s
221
 
""" % osutils.sha(REV_1_STRICT_TESTAMENT).hexdigest()
 
236
""" % osutils.sha_string(REV_1_STRICT_TESTAMENT)
222
237
 
223
238
 
224
239
REV_1_SHORT_STRICT3 = """\
225
240
bazaar testament short form 3 strict
226
241
revision-id: test@user-1
227
242
sha1: %s
228
 
""" % osutils.sha(REV_1_STRICT_TESTAMENT3).hexdigest()
 
243
""" % osutils.sha_string(REV_1_STRICT_TESTAMENT3)
229
244
 
230
245
 
231
246
REV_2_TESTAMENT = """\
293
308
bazaar-ng testament short form 1
294
309
revision-id: test@user-2
295
310
sha1: %s
296
 
""" % osutils.sha(REV_2_TESTAMENT).hexdigest()
 
311
""" % osutils.sha_string(REV_2_TESTAMENT)
297
312
 
298
313
 
299
314
REV_2_SHORT_STRICT = """\
300
315
bazaar-ng testament short form 2.1
301
316
revision-id: test@user-2
302
317
sha1: %s
303
 
""" % osutils.sha(REV_2_STRICT_TESTAMENT).hexdigest()
 
318
""" % osutils.sha_string(REV_2_STRICT_TESTAMENT)
304
319
 
305
320
 
306
321
REV_2_SHORT_STRICT3 = """\
307
322
bazaar testament short form 3 strict
308
323
revision-id: test@user-2
309
324
sha1: %s
310
 
""" % osutils.sha(REV_2_STRICT_TESTAMENT3).hexdigest()
 
325
""" % osutils.sha_string(REV_2_STRICT_TESTAMENT3)
311
326
 
312
327
 
313
328
REV_PROPS_TESTAMENT = """\