← 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: 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
21
21
import os
22
22
 
23
23
from bzrlib import osutils
24
 
from bzrlib.tests import SymlinkFeature, TestCaseWithTransport
 
24
from bzrlib.tests import TestCaseWithTransport
25
25
from bzrlib.testament import (
26
26
    Testament,
27
27
    StrictTestament,
28
28
    StrictTestament3,
29
29
    )
30
30
from bzrlib.transform import TreeTransform
 
31
from bzrlib.tests.features import (
 
32
    SymlinkFeature,
 
33
    )
31
34
 
32
35
 
33
36
class TestamentSetup(TestCaseWithTransport):
34
37
 
35
38
    def setUp(self):
36
39
        super(TestamentSetup, self).setUp()
37
 
        self.wt = self.make_branch_and_tree('.', format='dirstate-with-subtree')
 
40
        self.wt = self.make_branch_and_tree('.', format='development-subtree')
38
41
        self.wt.set_root_id('TREE_ROT')
39
42
        b = self.b = self.wt.branch
40
43
        b.nick = "test branch"
223
226
bazaar-ng testament short form 1
224
227
revision-id: test@user-1
225
228
sha1: %s
226
 
""" % osutils.sha(REV_1_TESTAMENT).hexdigest()
 
229
""" % osutils.sha_string(REV_1_TESTAMENT)
227
230
 
228
231
 
229
232
REV_1_SHORT_STRICT = """\
230
233
bazaar-ng testament short form 2.1
231
234
revision-id: test@user-1
232
235
sha1: %s
233
 
""" % osutils.sha(REV_1_STRICT_TESTAMENT).hexdigest()
 
236
""" % osutils.sha_string(REV_1_STRICT_TESTAMENT)
234
237
 
235
238
 
236
239
REV_1_SHORT_STRICT3 = """\
237
240
bazaar testament short form 3 strict
238
241
revision-id: test@user-1
239
242
sha1: %s
240
 
""" % osutils.sha(REV_1_STRICT_TESTAMENT3).hexdigest()
 
243
""" % osutils.sha_string(REV_1_STRICT_TESTAMENT3)
241
244
 
242
245
 
243
246
REV_2_TESTAMENT = """\
305
308
bazaar-ng testament short form 1
306
309
revision-id: test@user-2
307
310
sha1: %s
308
 
""" % osutils.sha(REV_2_TESTAMENT).hexdigest()
 
311
""" % osutils.sha_string(REV_2_TESTAMENT)
309
312
 
310
313
 
311
314
REV_2_SHORT_STRICT = """\
312
315
bazaar-ng testament short form 2.1
313
316
revision-id: test@user-2
314
317
sha1: %s
315
 
""" % osutils.sha(REV_2_STRICT_TESTAMENT).hexdigest()
 
318
""" % osutils.sha_string(REV_2_STRICT_TESTAMENT)
316
319
 
317
320
 
318
321
REV_2_SHORT_STRICT3 = """\
319
322
bazaar testament short form 3 strict
320
323
revision-id: test@user-2
321
324
sha1: %s
322
 
""" % osutils.sha(REV_2_STRICT_TESTAMENT3).hexdigest()
 
325
""" % osutils.sha_string(REV_2_STRICT_TESTAMENT3)
323
326
 
324
327
 
325
328
REV_PROPS_TESTAMENT = """\