/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« 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: 2018-11-16 18:59:44 UTC
  • mfrom: (7143.15.15 more-cleanups)
  • Revision ID: breezy.the.bot@gmail.com-20181116185944-biefv1sub37qfybm
Sprinkle some PEP8iness.

Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_mapping.py
49
49
        self.assertEqual(b"git-v1:"
50
50
                         b"c6a4d8f1fa4ac650748e647c4b1b368f589a7356",
51
51
                         BzrGitMappingv1().revision_id_foreign_to_bzr(
52
 
                            b"c6a4d8f1fa4ac650748e647c4b1b368f589a7356"))
 
52
                             b"c6a4d8f1fa4ac650748e647c4b1b368f589a7356"))
53
53
 
54
54
    def test_simple_bzr_to_git_revision_id(self):
55
55
        self.assertEqual((b"c6a4d8f1fa4ac650748e647c4b1b368f589a7356",
56
 
                         BzrGitMappingv1()),
 
56
                          BzrGitMappingv1()),
57
57
                         BzrGitMappingv1().revision_id_bzr_to_foreign(
58
 
                            b"git-v1:"
59
 
                            b"c6a4d8f1fa4ac650748e647c4b1b368f589a7356"))
 
58
            b"git-v1:"
 
59
            b"c6a4d8f1fa4ac650748e647c4b1b368f589a7356"))
60
60
 
61
61
    def test_is_control_file(self):
62
62
        mapping = BzrGitMappingv1()
109
109
        c.author = b"Author"
110
110
        mapping = BzrGitMappingv1()
111
111
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
112
 
            mapping.revision_id_foreign_to_bzr)
 
112
                                                                mapping.revision_id_foreign_to_bzr)
113
113
        self.assertEqual(None, roundtrip_revid)
114
114
        self.assertEqual({}, verifiers)
115
115
        self.assertEqual(u"Some message", rev.message)
134
134
        c.encoding = b"iso8859-1"
135
135
        mapping = BzrGitMappingv1()
136
136
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
137
 
            mapping.revision_id_foreign_to_bzr)
 
137
                                                                mapping.revision_id_foreign_to_bzr)
138
138
        self.assertEqual(None, roundtrip_revid)
139
139
        self.assertEqual({}, verifiers)
140
140
        self.assertEqual(u"Authér", rev.properties[u'author'])
153
153
        c.author = u"Authér".encode("latin1")
154
154
        mapping = BzrGitMappingv1()
155
155
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
156
 
            mapping.revision_id_foreign_to_bzr)
 
156
                                                                mapping.revision_id_foreign_to_bzr)
157
157
        self.assertEqual(None, roundtrip_revid)
158
158
        self.assertEqual({}, verifiers)
159
159
        self.assertEqual(u"Authér", rev.properties[u'author'])
172
172
        c.author = u"Authér".encode("utf-8")
173
173
        mapping = BzrGitMappingv1()
174
174
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
175
 
            mapping.revision_id_foreign_to_bzr)
 
175
                                                                mapping.revision_id_foreign_to_bzr)
176
176
        self.assertEqual(None, roundtrip_revid)
177
177
        self.assertEqual({}, verifiers)
178
178
        self.assertEqual(u"Authér", rev.properties[u'author'])
192
192
        c._extra.append((b"iamextra", b"foo"))
193
193
        mapping = BzrGitMappingv1()
194
194
        self.assertRaises(UnknownCommitExtra, mapping.import_commit, c,
195
 
            mapping.revision_id_foreign_to_bzr)
 
195
                          mapping.revision_id_foreign_to_bzr)
196
196
 
197
197
    def test_mergetag(self):
198
198
        c = Commit()
205
205
        c.author_timezone = 60 * 3
206
206
        c.author = b"Author"
207
207
        tag = make_object(Tag,
208
 
                tagger=b'Jelmer Vernooij <jelmer@samba.org>',
209
 
                name=b'0.1', message=None,
210
 
                object=(Blob, b'd80c186a03f423a81b39df39dc87fd269736ca86'),
211
 
                tag_time=423423423, tag_timezone=0)
 
208
                          tagger=b'Jelmer Vernooij <jelmer@samba.org>',
 
209
                          name=b'0.1', message=None,
 
210
                          object=(
 
211
                              Blob, b'd80c186a03f423a81b39df39dc87fd269736ca86'),
 
212
                          tag_time=423423423, tag_timezone=0)
212
213
        c.mergetag = [tag]
213
214
        mapping = BzrGitMappingv1()
214
215
        rev, roundtrip_revid, verifiers = mapping.import_commit(
215
 
                c, mapping.revision_id_foreign_to_bzr)
216
 
        self.assertEqual(rev.properties[u'git-mergetag-0'], tag.as_raw_string())
 
216
            c, mapping.revision_id_foreign_to_bzr)
 
217
        self.assertEqual(
 
218
            rev.properties[u'git-mergetag-0'], tag.as_raw_string())
217
219
 
218
220
 
219
221
class RoundtripRevisionsFromBazaar(tests.TestCase):
226
228
 
227
229
    def assertRoundtripRevision(self, orig_rev):
228
230
        commit = self.mapping.export_commit(orig_rev, b"mysha",
229
 
            self._lookup_parent, True, b"testamentsha")
 
231
                                            self._lookup_parent, True, b"testamentsha")
230
232
        rev, roundtrip_revid, verifiers = self.mapping.import_commit(
231
233
            commit, self.mapping.revision_id_foreign_to_bzr)
232
234
        self.assertEqual(rev.revision_id,
233
 
            self.mapping.revision_id_foreign_to_bzr(commit.id))
 
235
                         self.mapping.revision_id_foreign_to_bzr(commit.id))
234
236
        if self.mapping.roundtripping:
235
 
            self.assertEqual({"testament3-sha1": b"testamentsha"} , verifiers)
 
237
            self.assertEqual({"testament3-sha1": b"testamentsha"}, verifiers)
236
238
            self.assertEqual(orig_rev.revision_id, roundtrip_revid)
237
239
            self.assertEqual(orig_rev.properties, rev.properties)
238
240
            self.assertEqual(orig_rev.committer, rev.committer)
244
246
            self.assertEqual({}, verifiers)
245
247
 
246
248
    def test_simple_commit(self):
247
 
        r = Revision(self.mapping.revision_id_foreign_to_bzr(b"edf99e6c56495c620f20d5dacff9859ff7119261"))
 
249
        r = Revision(self.mapping.revision_id_foreign_to_bzr(
 
250
            b"edf99e6c56495c620f20d5dacff9859ff7119261"))
248
251
        r.message = "MyCommitMessage"
249
252
        r.parent_ids = []
250
253
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
300
303
        rev, roundtrip_revid, verifiers = self.mapping.import_commit(
301
304
            commit1, self.mapping.revision_id_foreign_to_bzr)
302
305
        commit2 = self.mapping.export_commit(rev, "12341212121212", None,
303
 
            True, None)
 
306
                                             True, None)
304
307
        self.assertEqual(commit1.committer, commit2.committer)
305
308
        self.assertEqual(commit1.commit_time, commit2.commit_time)
306
309
        self.assertEqual(commit1.commit_timezone, commit2.commit_timezone)
384
387
        c.author_timezone = 60 * 2
385
388
        c.author = b"Author <author>"
386
389
        tag = make_object(Tag,
387
 
                tagger=b'Jelmer Vernooij <jelmer@samba.org>',
388
 
                name=b'0.1', message=None,
389
 
                object=(Blob, b'd80c186a03f423a81b39df39dc87fd269736ca86'),
390
 
                tag_time=423423423, tag_timezone=0)
 
390
                          tagger=b'Jelmer Vernooij <jelmer@samba.org>',
 
391
                          name=b'0.1', message=None,
 
392
                          object=(
 
393
                              Blob, b'd80c186a03f423a81b39df39dc87fd269736ca86'),
 
394
                          tag_time=423423423, tag_timezone=0)
391
395
        c.mergetag = [tag]
392
396
        self.assertRoundtripCommit(c)
393
397
 
406
410
        self.assertEqual(b"person <bar@blah.nl>",
407
411
                         fix_person_identifier(b"person<bar@blah.nl>"))
408
412
        self.assertRaises(ValueError,
409
 
                         fix_person_identifier, b"person >bar@blah.nl<")
 
413
                          fix_person_identifier, b"person >bar@blah.nl<")