← 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: John Arbash Meinel
  • Date: 2013-06-24 12:03:12 UTC
  • mfrom: (6437.77.2 2.5)
  • mto: This revision was merged to the branch mainline in revision 6579.
  • Revision ID: john@arbash-meinel.com-20130624120312-pmvck24x052csigx
Merge lp:bzr/2.5 r6515 to get the fix for bug #855155 (Dirstate.update_basis_by_delta)

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
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
22
 
 
23
from bzrlib import osutils
24
24
from bzrlib.tests import TestCaseWithTransport
25
 
from bzrlib.testament import Testament, StrictTestament, StrictTestament3
 
25
from bzrlib.testament import (
 
26
    Testament,
 
27
    StrictTestament,
 
28
    StrictTestament3,
 
29
    )
26
30
from bzrlib.transform import TreeTransform
27
 
from bzrlib.osutils import has_symlinks
 
31
from bzrlib.tests.features import (
 
32
    SymlinkFeature,
 
33
    )
28
34
 
29
35
 
30
36
class TestamentSetup(TestCaseWithTransport):
31
37
 
32
38
    def setUp(self):
33
39
        super(TestamentSetup, self).setUp()
34
 
        self.wt = self.make_branch_and_tree('.', format='dirstate-with-subtree')
 
40
        self.wt = self.make_branch_and_tree('.', format='development-subtree')
35
41
        self.wt.set_root_id('TREE_ROT')
36
42
        b = self.b = self.wt.branch
37
43
        b.nick = "test branch"
98
104
 
99
105
    def test_testament_symlinks(self):
100
106
        """Testament containing symlink (where possible)"""
101
 
        if not has_symlinks():
102
 
            return
 
107
        self.requireFeature(SymlinkFeature)
103
108
        os.symlink('wibble/linktarget', 'link')
104
109
        self.wt.add(['link'], ['link-id'])
105
110
        self.wt.commit(message='add symlink',
131
136
            timestamp=1129025493,
132
137
            timezone=36000,
133
138
            rev_id='test@user-3',
134
 
            committer='Erik B\xe5gfors <test@user>',
 
139
            committer=u'Erik B\xe5gfors <test@user>',
135
140
            revprops={'uni':u'\xb5'}
136
141
            )
137
142
        t = self.from_revision(self.b.repository, 'test@user-3')
138
143
        self.assertEqualDiff(
139
144
            self.expected('sample_unicode').encode('utf-8'), t.as_text())
140
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
 
141
154
    def test___init__(self):
142
155
        revision = self.b.repository.get_revision('test@user-2')
143
 
        inventory = self.b.repository.get_inventory('test@user-2')
144
 
        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)
145
158
        text_1 = testament_1.as_short_text()
146
 
        text_2 = self.from_revision(self.b.repository, 
 
159
        text_2 = self.from_revision(self.b.repository,
147
160
                                    'test@user-2').as_short_text()
148
161
        self.assertEqual(text_1, text_2)
149
 
                    
 
162
 
150
163
 
151
164
class TestamentTestsStrict(TestamentTests):
152
 
    
 
165
 
153
166
    def testament_class(self):
154
167
        return StrictTestament
155
168
 
156
169
 
157
170
class TestamentTestsStrict2(TestamentTests):
158
 
    
 
171
 
159
172
    def testament_class(self):
160
173
        return StrictTestament3
161
174
 
213
226
bazaar-ng testament short form 1
214
227
revision-id: test@user-1
215
228
sha1: %s
216
 
""" % sha(REV_1_TESTAMENT).hexdigest()
 
229
""" % osutils.sha_string(REV_1_TESTAMENT)
217
230
 
218
231
 
219
232
REV_1_SHORT_STRICT = """\
220
233
bazaar-ng testament short form 2.1
221
234
revision-id: test@user-1
222
235
sha1: %s
223
 
""" % sha(REV_1_STRICT_TESTAMENT).hexdigest()
 
236
""" % osutils.sha_string(REV_1_STRICT_TESTAMENT)
224
237
 
225
238
 
226
239
REV_1_SHORT_STRICT3 = """\
227
240
bazaar testament short form 3 strict
228
241
revision-id: test@user-1
229
242
sha1: %s
230
 
""" % sha(REV_1_STRICT_TESTAMENT3).hexdigest()
 
243
""" % osutils.sha_string(REV_1_STRICT_TESTAMENT3)
231
244
 
232
245
 
233
246
REV_2_TESTAMENT = """\
295
308
bazaar-ng testament short form 1
296
309
revision-id: test@user-2
297
310
sha1: %s
298
 
""" % sha(REV_2_TESTAMENT).hexdigest()
 
311
""" % osutils.sha_string(REV_2_TESTAMENT)
299
312
 
300
313
 
301
314
REV_2_SHORT_STRICT = """\
302
315
bazaar-ng testament short form 2.1
303
316
revision-id: test@user-2
304
317
sha1: %s
305
 
""" % sha(REV_2_STRICT_TESTAMENT).hexdigest()
 
318
""" % osutils.sha_string(REV_2_STRICT_TESTAMENT)
306
319
 
307
320
 
308
321
REV_2_SHORT_STRICT3 = """\
309
322
bazaar testament short form 3 strict
310
323
revision-id: test@user-2
311
324
sha1: %s
312
 
""" % sha(REV_2_STRICT_TESTAMENT3).hexdigest()
 
325
""" % osutils.sha_string(REV_2_STRICT_TESTAMENT3)
313
326
 
314
327
 
315
328
REV_PROPS_TESTAMENT = """\