← 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: 2011-01-12 21:27:00 UTC
  • mto: This revision was merged to the branch mainline in revision 5605.
  • Revision ID: john@arbash-meinel.com-20110112212700-esqmtrmevddxrsq2
Clean up the test slightly, hoping to avoid race conditions, update NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_testament.py
22
22
 
23
23
from bzrlib import osutils
24
24
from bzrlib.tests import SymlinkFeature, TestCaseWithTransport
25
 
from bzrlib.testament import (
26
 
    Testament,
27
 
    StrictTestament,
28
 
    StrictTestament3,
29
 
    )
 
25
from bzrlib.testament import Testament, StrictTestament, StrictTestament3
30
26
from bzrlib.transform import TreeTransform
31
27
 
32
28
 
140
136
        self.assertEqualDiff(
141
137
            self.expected('sample_unicode').encode('utf-8'), t.as_text())
142
138
 
143
 
    def test_from_tree(self):
144
 
        tree = self.b.repository.revision_tree('test@user-2')
145
 
        testament = self.testament_class().from_revision_tree(tree)
146
 
        text_1 = testament.as_short_text()
147
 
        text_2 = self.from_revision(self.b.repository,
148
 
                                    'test@user-2').as_short_text()
149
 
        self.assertEqual(text_1, text_2)
150
 
 
151
139
    def test___init__(self):
152
140
        revision = self.b.repository.get_revision('test@user-2')
153
 
        tree = self.b.repository.revision_tree('test@user-2')
154
 
        testament_1 = self.testament_class()(revision, tree)
 
141
        inventory = self.b.repository.get_inventory('test@user-2')
 
142
        testament_1 = self.testament_class()(revision, inventory)
155
143
        text_1 = testament_1.as_short_text()
156
144
        text_2 = self.from_revision(self.b.repository,
157
145
                                    'test@user-2').as_short_text()
223
211
bazaar-ng testament short form 1
224
212
revision-id: test@user-1
225
213
sha1: %s
226
 
""" % osutils.sha_string(REV_1_TESTAMENT)
 
214
""" % osutils.sha(REV_1_TESTAMENT).hexdigest()
227
215
 
228
216
 
229
217
REV_1_SHORT_STRICT = """\
230
218
bazaar-ng testament short form 2.1
231
219
revision-id: test@user-1
232
220
sha1: %s
233
 
""" % osutils.sha_string(REV_1_STRICT_TESTAMENT)
 
221
""" % osutils.sha(REV_1_STRICT_TESTAMENT).hexdigest()
234
222
 
235
223
 
236
224
REV_1_SHORT_STRICT3 = """\
237
225
bazaar testament short form 3 strict
238
226
revision-id: test@user-1
239
227
sha1: %s
240
 
""" % osutils.sha_string(REV_1_STRICT_TESTAMENT3)
 
228
""" % osutils.sha(REV_1_STRICT_TESTAMENT3).hexdigest()
241
229
 
242
230
 
243
231
REV_2_TESTAMENT = """\
305
293
bazaar-ng testament short form 1
306
294
revision-id: test@user-2
307
295
sha1: %s
308
 
""" % osutils.sha_string(REV_2_TESTAMENT)
 
296
""" % osutils.sha(REV_2_TESTAMENT).hexdigest()
309
297
 
310
298
 
311
299
REV_2_SHORT_STRICT = """\
312
300
bazaar-ng testament short form 2.1
313
301
revision-id: test@user-2
314
302
sha1: %s
315
 
""" % osutils.sha_string(REV_2_STRICT_TESTAMENT)
 
303
""" % osutils.sha(REV_2_STRICT_TESTAMENT).hexdigest()
316
304
 
317
305
 
318
306
REV_2_SHORT_STRICT3 = """\
319
307
bazaar testament short form 3 strict
320
308
revision-id: test@user-2
321
309
sha1: %s
322
 
""" % osutils.sha_string(REV_2_STRICT_TESTAMENT3)
 
310
""" % osutils.sha(REV_2_STRICT_TESTAMENT3).hexdigest()
323
311
 
324
312
 
325
313
REV_PROPS_TESTAMENT = """\