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

  • Committer: Martin
  • Date: 2018-06-30 22:18:39 UTC
  • mfrom: (7010 work)
  • mto: This revision was merged to the branch mainline in revision 7012.
  • Revision ID: gzlist@googlemail.com-20180630221839-98zi78xwcggestse
Merge trunk to fix conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/tests/test_cache.py
60
60
 
61
61
    def _get_test_commit(self):
62
62
        c = Commit()
63
 
        c.committer = "Jelmer <jelmer@samba.org>"
 
63
        c.committer = b"Jelmer <jelmer@samba.org>"
64
64
        c.commit_time = 0
65
65
        c.commit_timezone = 0
66
 
        c.author = "Jelmer <jelmer@samba.org>"
 
66
        c.author = b"Jelmer <jelmer@samba.org>"
67
67
        c.author_time = 0
68
68
        c.author_timezone = 0
69
 
        c.message = "Teh foo bar"
70
 
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
69
        c.message = b"Teh foo bar"
 
70
        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
71
71
        return c
72
72
 
73
73
    def test_commit(self):
74
74
        self.map.start_write_group()
75
 
        updater = self.cache.get_updater(Revision("myrevid"))
 
75
        updater = self.cache.get_updater(Revision(b"myrevid"))
76
76
        c = self._get_test_commit()
77
77
        updater.add_object(c, {
78
 
            "testament3-sha1": "cc9462f7f8263ef5adf8eff2fb936bb36b504cba"},
 
78
            "testament3-sha1": b"cc9462f7f8263ef5adf8eff2fb936bb36b504cba"},
79
79
            None)
80
80
        updater.finish()
81
81
        self.map.commit_write_group()
82
82
        self.assertEqual(
83
 
            [("commit", ("myrevid",
84
 
                "cc9462f7f8263ef5adfbeff2fb936bb36b504cba",
85
 
                {"testament3-sha1": "cc9462f7f8263ef5adf8eff2fb936bb36b504cba"},
 
83
            [("commit", (b"myrevid",
 
84
                b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba",
 
85
                {"testament3-sha1": b"cc9462f7f8263ef5adf8eff2fb936bb36b504cba"},
86
86
                ))],
87
87
            list(self.map.lookup_git_sha(c.id)))
88
 
        self.assertEqual(c.id, self.map.lookup_commit("myrevid"))
 
88
        self.assertEqual(c.id, self.map.lookup_commit(b"myrevid"))
89
89
 
90
90
    def test_lookup_notfound(self):
91
91
        self.assertRaises(KeyError, list,