/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_remote.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-03 03:20:44 UTC
  • mfrom: (7018.3.10 git-fixes)
  • Revision ID: breezy.the.bot@gmail.com-20180703032044-t5a5w5y0tmzrbezc
Port a few more bits of the git plugin to python 3.

Merged from https://code.launchpad.net/~jelmer/brz/git-fixes2/+merge/348803

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/tests/test_remote.py
129
129
 
130
130
    def test_sprout_with_tags(self):
131
131
        c1 = self.remote_real.do_commit(
132
 
                message='message',
 
132
                message=b'message',
133
133
                committer=b'committer <committer@example.com>',
134
134
                author=b'author <author@example.com>')
135
135
        c2 = self.remote_real.do_commit(
137
137
                committer=b'committer <committer@example.com>',
138
138
                author=b'author <author@example.com>',
139
139
                ref=b'refs/tags/another')
140
 
        self.remote_real.refs['refs/tags/blah'] = self.remote_real.head()
 
140
        self.remote_real.refs[b'refs/tags/blah'] = self.remote_real.head()
141
141
 
142
142
        remote = ControlDir.open(self.remote_url)
143
143
        self.make_controldir('local', format=self._to_format)
284
284
            self.assertRaises(DivergedBranches, wt.branch.push, newbranch, lossy=True)
285
285
 
286
286
        self.assertEqual(
287
 
                {'refs/heads/newbranch': c1 },
 
287
                {b'refs/heads/newbranch': c1 },
288
288
                self.remote_real.get_refs())
289
289
 
290
290
        if self._from_format == 'git':
292
292
        else:
293
293
            wt.branch.push(newbranch, lossy=True, overwrite=True)
294
294
 
295
 
        self.assertNotEqual(c1, self.remote_real.refs['refs/heads/newbranch'])
 
295
        self.assertNotEqual(c1, self.remote_real.refs[b'refs/heads/newbranch'])
296
296
 
297
297
 
298
298
class PushToRemoteFromBzrTests(PushToRemoteBase,TestCaseWithTransport):