/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_pristine_tar.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_pristine_tar.py
43
43
class RevisionPristineTarDataTests(TestCase):
44
44
 
45
45
    def test_pristine_tar_delta_unknown(self):
46
 
        rev = Revision("myrevid")
 
46
        rev = Revision(b"myrevid")
47
47
        self.assertRaises(KeyError,
48
48
            revision_pristine_tar_data, rev)
49
49
 
50
50
    def test_pristine_tar_delta_gz(self):
51
 
        rev = Revision("myrevid")
52
 
        rev.properties["deb-pristine-delta"] = standard_b64encode(b"bla")
 
51
        rev = Revision(b"myrevid")
 
52
        rev.properties[u"deb-pristine-delta"] = standard_b64encode(b"bla")
53
53
        self.assertEqual((b"bla", "gz"), revision_pristine_tar_data(rev))
54
54
 
55
55
 
58
58
    def test_read_pristine_tar_data_no_branch(self):
59
59
        r = GitMemoryRepo()
60
60
        self.assertRaises(KeyError, read_git_pristine_tar_data,
61
 
            r, "foo")
 
61
            r, b"foo")
62
62
 
63
63
    def test_read_pristine_tar_data_no_file(self):
64
64
        r = GitMemoryRepo()
67
67
        r.object_store.add_object(b)
68
68
        t.add(b"README", stat.S_IFREG | 0o644, b.id)
69
69
        r.object_store.add_object(t)
70
 
        r.do_commit("Add README", tree=t.id,
71
 
                    ref='refs/heads/pristine-tar')
 
70
        r.do_commit(b"Add README", tree=t.id,
 
71
                    ref=b'refs/heads/pristine-tar')
72
72
        self.assertRaises(KeyError, read_git_pristine_tar_data,
73
 
            r, "foo")
 
73
            r, b"foo")
74
74
 
75
75
    def test_read_pristine_tar_data(self):
76
76
        r = GitMemoryRepo()
86
86
                    ref=b'refs/heads/pristine-tar')
87
87
        self.assertEqual(
88
88
            (b"some yummy data", b"someid"),
89
 
            read_git_pristine_tar_data(r, 'foo'))
 
89
            read_git_pristine_tar_data(r, b'foo'))
90
90
 
91
91
 
92
92
class StoreGitPristineTarData(TestCase):
93
93
 
94
94
    def test_store_new(self):
95
95
        r = GitMemoryRepo()
96
 
        cid = store_git_pristine_tar_data(r, "foo", "mydelta", "myid")
 
96
        cid = store_git_pristine_tar_data(r, b"foo", b"mydelta", b"myid")
97
97
        tree = get_pristine_tar_tree(r)
98
98
        self.assertEqual(
99
 
            (stat.S_IFREG | 0o644, "7b02de8ac4162e64f402c43487d8a40a505482e1"),
100
 
            tree["README"])
 
99
            (stat.S_IFREG | 0o644, b"7b02de8ac4162e64f402c43487d8a40a505482e1"),
 
100
            tree[b"README"])
101
101
        self.assertEqual(r[cid].tree, tree.id)
102
 
        self.assertEqual(r[tree["foo.delta"][1]].data, "mydelta")
103
 
        self.assertEqual(r[tree["foo.id"][1]].data, "myid")
 
102
        self.assertEqual(r[tree[b"foo.delta"][1]].data, b"mydelta")
 
103
        self.assertEqual(r[tree[b"foo.id"][1]].data, b"myid")
104
104
 
105
 
        self.assertEqual(("mydelta", "myid"),
106
 
            read_git_pristine_tar_data(r, "foo"))
 
105
        self.assertEqual((b"mydelta", b"myid"),
 
106
            read_git_pristine_tar_data(r, b"foo"))