/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_push.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_push.py
65
65
    def test_pointless_fetch_refs(self):
66
66
        interrepo = self._get_interrepo(mapping=BzrGitMappingExperimental())
67
67
        revidmap, old_refs, new_refs = interrepo.fetch_refs(lambda x: {}, lossy=False)
68
 
        self.assertEqual(old_refs, {'HEAD': ('ref: refs/heads/master', None)})
 
68
        self.assertEqual(old_refs, {b'HEAD': (b'ref: refs/heads/master', None)})
69
69
        self.assertEqual(new_refs, {})
70
70
 
71
71
    def test_pointless_lossy_fetch_refs(self):
72
72
        revidmap, old_refs, new_refs = self._get_interrepo().fetch_refs(lambda x: {}, lossy=True)
73
 
        self.assertEqual(old_refs, {'HEAD': ('ref: refs/heads/master', None)})
 
73
        self.assertEqual(old_refs, {b'HEAD': (b'ref: refs/heads/master', None)})
74
74
        self.assertEqual(new_refs, {})
75
75
        self.assertEqual(revidmap, {})
76
76
 
85
85
        interrepo.source_store.lock_read()
86
86
        self.addCleanup(interrepo.source_store.unlock)
87
87
        self.assertEqual([],
88
 
                list(interrepo.missing_revisions([(None, "unknown")])))
 
88
                list(interrepo.missing_revisions([(None, b"unknown")])))
89
89
 
90
90
    def test_odd_rename(self):
91
91
        # Add initial revision to bzr branch.
103
103
 
104
104
        # Push bzr branch to git branch.
105
105
        def decide(x):
106
 
            return { "refs/heads/master": (None, last_revid) }
 
106
            return { b"refs/heads/master": (None, last_revid) }
107
107
        interrepo = self._get_interrepo()
108
108
        revidmap, old_refs, new_refs = interrepo.fetch_refs(decide, lossy=True)
109
109
        gitid = revidmap[last_revid][0]
111
111
        commit = store[gitid]
112
112
        tree = store[commit.tree]
113
113
        tree.check()
114
 
        self.assertIn("baz", tree, repr(tree.items()))
115
 
        self.assertIn(tree["baz"][1], store)
116
 
        baz = store[tree["baz"][1]]
 
114
        self.assertIn(b"baz", tree, repr(tree.items()))
 
115
        self.assertIn(tree[b"baz"][1], store)
 
116
        baz = store[tree[b"baz"][1]]
117
117
        baz.check()
118
 
        ircdotnet = store[baz["IrcDotNet"][1]]
 
118
        ircdotnet = store[baz[b"IrcDotNet"][1]]
119
119
        ircdotnet.check()
120
 
        foobar = store[ircdotnet["foobar"][1]]
 
120
        foobar = store[ircdotnet[b"foobar"][1]]
121
121
        foobar.check()