/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/plugins/git/tests/test_builder.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-03 00:15:59 UTC
  • mto: This revision was merged to the branch mainline in revision 7027.
  • Revision ID: jelmer@jelmer.uk-20180703001559-crogxh6en8s4d83b
Fix remaining git tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/tests/test_builder.py
53
53
    def test_set_file_newline(self):
54
54
        stream = BytesIO()
55
55
        builder = tests.GitBranchBuilder(stream)
56
 
        builder.set_file(u'foo\nbar', 'contents\nbar\n', False)
57
 
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nbar\n\n',
 
56
        builder.set_file(u'foo\nbar', b'contents\nbar\n', False)
 
57
        self.assertEqualDiff(b'blob\nmark :1\ndata 13\ncontents\nbar\n\n',
58
58
                             stream.getvalue())
59
59
        self.assertEqual([b'M 100644 :1 "foo\\nbar"\n'], builder.commit_info)
60
60
 
114
114
        builder = tests.GitBranchBuilder(stream)
115
115
 
116
116
        builder.set_file(u'f\xb5/bar', b'contents\nbar\n', False)
117
 
        self.assertEqual('2', builder.commit(b'Joe Foo <joe@foo.com>',
 
117
        self.assertEqual(b'2', builder.commit(b'Joe Foo <joe@foo.com>',
118
118
                                           u'committing f\xb5/bar',
119
119
                                           timestamp=1194586400,
120
 
                                           timezone='+0100'))
 
120
                                           timezone=b'+0100'))
121
121
        self.assertEqualDiff(b'blob\nmark :1\ndata 13\ncontents\nbar\n\n'
122
122
                             b'commit refs/heads/master\n'
123
123
                             b'mark :2\n'
238
238
    def test_reset_revision(self):
239
239
        stream = BytesIO()
240
240
        builder = tests.GitBranchBuilder(stream)
241
 
        builder.reset(mark=123)
 
241
        builder.reset(mark=b'123')
242
242
        self.assertEqualDiff(
243
243
            b'reset refs/heads/master\n'
244
244
            b'from :123\n'