~ubuntu-branches/ubuntu/vivid/dulwich/vivid-proposed

« back to all changes in this revision

Viewing changes to dulwich/tests/test_objects.py

  • Committer: Package Import Robot
  • Author(s): Jelmer Vernooij
  • Date: 2013-05-31 00:58:42 UTC
  • mfrom: (1.5.1) (31.1.1 experimental)
  • Revision ID: package-import@ubuntu.com-20130531005842-whdxa8wnmeqqfidr
Tags: 0.9.0-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
157
157
 
158
158
    def test_read_tag_from_file(self):
159
159
        t = self.get_tag(tag_sha)
160
 
        self.assertEqual(t.object, (Commit, '51b668fd5bf7061b7d6fa525f88803e6cfadaa51'))
 
160
        self.assertEqual(t.object,
 
161
            (Commit, '51b668fd5bf7061b7d6fa525f88803e6cfadaa51'))
161
162
        self.assertEqual(t.name,'signed')
162
163
        self.assertEqual(t.tagger,'Ali Sabil <ali.sabil@gmail.com>')
163
164
        self.assertEqual(t.tag_time, 1231203091)
307
308
        c = self.make_commit(commit_timezone=(-1 * 3600))
308
309
        self.assertTrue(" -0100\n" in c.as_raw_string())
309
310
 
 
311
    def test_deserialize(self):
 
312
        c = self.make_commit()
 
313
        d = Commit()
 
314
        d._deserialize(c.as_raw_chunks())
 
315
        self.assertEqual(c, d)
 
316
 
 
317
    def test_serialize_mergetag(self):
 
318
        tag = make_object(
 
319
            Tag, object=(Commit, "a38d6181ff27824c79fc7df825164a212eff6a3f"),
 
320
            object_type_name="commit",
 
321
            name="v2.6.22-rc7",
 
322
            tag_time=1183319674,
 
323
            tag_timezone=0,
 
324
            tagger="Linus Torvalds <torvalds@woody.linux-foundation.org>",
 
325
            message=default_message)
 
326
        commit = self.make_commit(mergetag=[tag])
 
327
 
 
328
        self.assertEqual("""tree d80c186a03f423a81b39df39dc87fd269736ca86
 
329
parent ab64bbdcc51b170d21588e5c5d391ee5c0c96dfd
 
330
parent 4cffe90e0a41ad3f5190079d7c8f036bde29cbe6
 
331
author James Westby <jw+debian@jameswestby.net> 1174773719 +0000
 
332
committer James Westby <jw+debian@jameswestby.net> 1174773719 +0000
 
333
mergetag object a38d6181ff27824c79fc7df825164a212eff6a3f
 
334
 type commit
 
335
 tag v2.6.22-rc7
 
336
 tagger Linus Torvalds <torvalds@woody.linux-foundation.org> 1183319674 +0000
 
337
 
 
338
 Linux 2.6.22-rc7
 
339
 -----BEGIN PGP SIGNATURE-----
 
340
 Version: GnuPG v1.4.7 (GNU/Linux)
 
341
 
 
342
 iD8DBQBGiAaAF3YsRnbiHLsRAitMAKCiLboJkQECM/jpYsY3WPfvUgLXkACgg3ql
 
343
 OK2XeQOiEeXtT76rV4t2WR4=
 
344
 =ivrA
 
345
 -----END PGP SIGNATURE-----
 
346
 
 
347
Merge ../b
 
348
""", commit.as_raw_string())
 
349
 
 
350
    def test_serialize_mergetags(self):
 
351
        tag = make_object(
 
352
            Tag, object=(Commit, "a38d6181ff27824c79fc7df825164a212eff6a3f"),
 
353
            object_type_name="commit",
 
354
            name="v2.6.22-rc7",
 
355
            tag_time=1183319674,
 
356
            tag_timezone=0,
 
357
            tagger="Linus Torvalds <torvalds@woody.linux-foundation.org>",
 
358
            message=default_message)
 
359
        commit = self.make_commit(mergetag=[tag, tag])
 
360
 
 
361
        self.assertEqual("""tree d80c186a03f423a81b39df39dc87fd269736ca86
 
362
parent ab64bbdcc51b170d21588e5c5d391ee5c0c96dfd
 
363
parent 4cffe90e0a41ad3f5190079d7c8f036bde29cbe6
 
364
author James Westby <jw+debian@jameswestby.net> 1174773719 +0000
 
365
committer James Westby <jw+debian@jameswestby.net> 1174773719 +0000
 
366
mergetag object a38d6181ff27824c79fc7df825164a212eff6a3f
 
367
 type commit
 
368
 tag v2.6.22-rc7
 
369
 tagger Linus Torvalds <torvalds@woody.linux-foundation.org> 1183319674 +0000
 
370
 
 
371
 Linux 2.6.22-rc7
 
372
 -----BEGIN PGP SIGNATURE-----
 
373
 Version: GnuPG v1.4.7 (GNU/Linux)
 
374
 
 
375
 iD8DBQBGiAaAF3YsRnbiHLsRAitMAKCiLboJkQECM/jpYsY3WPfvUgLXkACgg3ql
 
376
 OK2XeQOiEeXtT76rV4t2WR4=
 
377
 =ivrA
 
378
 -----END PGP SIGNATURE-----
 
379
mergetag object a38d6181ff27824c79fc7df825164a212eff6a3f
 
380
 type commit
 
381
 tag v2.6.22-rc7
 
382
 tagger Linus Torvalds <torvalds@woody.linux-foundation.org> 1183319674 +0000
 
383
 
 
384
 Linux 2.6.22-rc7
 
385
 -----BEGIN PGP SIGNATURE-----
 
386
 Version: GnuPG v1.4.7 (GNU/Linux)
 
387
 
 
388
 iD8DBQBGiAaAF3YsRnbiHLsRAitMAKCiLboJkQECM/jpYsY3WPfvUgLXkACgg3ql
 
389
 OK2XeQOiEeXtT76rV4t2WR4=
 
390
 =ivrA
 
391
 -----END PGP SIGNATURE-----
 
392
 
 
393
Merge ../b
 
394
""", commit.as_raw_string())
 
395
 
 
396
    def test_deserialize_mergetag(self):
 
397
        tag = make_object(
 
398
            Tag, object=(Commit, "a38d6181ff27824c79fc7df825164a212eff6a3f"),
 
399
            object_type_name="commit",
 
400
            name="v2.6.22-rc7",
 
401
            tag_time=1183319674,
 
402
            tag_timezone=0,
 
403
            tagger="Linus Torvalds <torvalds@woody.linux-foundation.org>",
 
404
            message=default_message)
 
405
        commit = self.make_commit(mergetag=[tag])
 
406
 
 
407
        d = Commit()
 
408
        d._deserialize(commit.as_raw_chunks())
 
409
        self.assertEqual(commit, d)
 
410
 
 
411
    def test_deserialize_mergetags(self):
 
412
        tag = make_object(
 
413
            Tag, object=(Commit, "a38d6181ff27824c79fc7df825164a212eff6a3f"),
 
414
            object_type_name="commit",
 
415
            name="v2.6.22-rc7",
 
416
            tag_time=1183319674,
 
417
            tag_timezone=0,
 
418
            tagger="Linus Torvalds <torvalds@woody.linux-foundation.org>",
 
419
            message=default_message)
 
420
        commit = self.make_commit(mergetag=[tag, tag])
 
421
 
 
422
        d = Commit()
 
423
        d._deserialize(commit.as_raw_chunks())
 
424
        self.assertEquals(commit, d)
 
425
 
310
426
 
311
427
default_committer = 'James Westby <jw+debian@jameswestby.net> 1174773719 +0000'
312
428