← Back to branch summary

~jelmer/brz/git-nested-tree-iterate

« back to all changes in this revision

Viewing changes to breezy/git/tests/test_mapping.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2022-01-14 00:10:50 UTC
  • mfrom: (7575.1.1 git-multiple-authors)
  • Revision ID: breezy.the.bot@gmail.com-20220114001050-yxwhsnf6r71o4581
Fix handling of invalid formatted authors field with multiple authors.

Merged from https://code.launchpad.net/~jelmer/brz/git-multiple-authors/+merge/414072

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_mapping.py
300
300
            self.assertEqual(list(orig_rev.parent_ids), list(rev.parent_ids))
301
301
        else:
302
302
            self.assertEqual({}, verifiers)
 
303
        return commit
303
304
 
304
305
    def test_simple_commit(self):
305
306
        r = Revision(self.mapping.revision_id_foreign_to_bzr(
342
343
        r.timezone = 0
343
344
        self.assertRoundtripRevision(r)
344
345
 
 
346
    def test_multiple_authors(self):
 
347
        r = Revision(b"myrevid")
 
348
        r.message = u"MyCommitMessage"
 
349
        r.parent_ids = []
 
350
        r.properties = {
 
351
            u"authors":
 
352
                "Jelmer Vernooij <jelmer@jelmer.uk>\n"
 
353
                "Alex <alexa@example.com>"}
 
354
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
355
        r.timestamp = 453543543
 
356
        r.timezone = 0
 
357
        c = self.assertRoundtripRevision(r)
 
358
        self.assertEqual(c.author, b'Jelmer Vernooij <jelmer@jelmer.uk>')
 
359
 
 
360
    def test_multiple_authors_comma(self):
 
361
        r = Revision(b"myrevid")
 
362
        r.message = u"MyCommitMessage"
 
363
        r.parent_ids = []
 
364
        r.properties = {
 
365
            u"authors":
 
366
                "Jelmer Vernooij <jelmer@jelmer.uk>, "
 
367
                "Alex <alexa@example.com>"}
 
368
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
369
        r.timestamp = 453543543
 
370
        r.timezone = 0
 
371
        c = self.assertRoundtripRevision(r)
 
372
        self.assertEqual(c.author, b'Jelmer Vernooij <jelmer@jelmer.uk>')
 
373
 
345
374
 
346
375
class RoundtripRevisionsFromGit(tests.TestCase):
347
376