/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: Jelmer Vernooij
  • Date: 2018-05-15 19:05:51 UTC
  • mfrom: (6968 work)
  • mto: (6973.5.1 python3-c)
  • mto: This revision was merged to the branch mainline in revision 6984.
  • Revision ID: jelmer@jelmer.uk-20180515190551-epr5abd0mtxmrehr
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/tests/test_pristine_tar.py
49
49
 
50
50
    def test_pristine_tar_delta_gz(self):
51
51
        rev = Revision("myrevid")
52
 
        rev.properties["deb-pristine-delta"] = standard_b64encode("bla")
53
 
        self.assertEquals(("bla", "gz"), revision_pristine_tar_data(rev))
 
52
        rev.properties["deb-pristine-delta"] = standard_b64encode(b"bla")
 
53
        self.assertEqual((b"bla", "gz"), revision_pristine_tar_data(rev))
54
54
 
55
55
 
56
56
class ReadPristineTarData(TestCase):
65
65
        t = Tree()
66
66
        b = Blob.from_string("README")
67
67
        r.object_store.add_object(b)
68
 
        t.add("README", stat.S_IFREG | 0644, b.id)
 
68
        t.add("README", stat.S_IFREG | 0o644, b.id)
69
69
        r.object_store.add_object(t)
70
70
        r.do_commit("Add README", tree=t.id,
71
71
                    ref='refs/heads/pristine-tar')
74
74
 
75
75
    def test_read_pristine_tar_data(self):
76
76
        r = GitMemoryRepo()
77
 
        delta = Blob.from_string("some yummy data")
 
77
        delta = Blob.from_string(b"some yummy data")
78
78
        r.object_store.add_object(delta)
79
 
        idfile = Blob.from_string("someid")
 
79
        idfile = Blob.from_string(b"someid")
80
80
        r.object_store.add_object(idfile)
81
81
        t = Tree()
82
 
        t.add("foo.delta", stat.S_IFREG | 0644, delta.id)
83
 
        t.add("foo.id", stat.S_IFREG | 0644, idfile.id)
 
82
        t.add(b"foo.delta", stat.S_IFREG | 0o644, delta.id)
 
83
        t.add(b"foo.id", stat.S_IFREG | 0o644, idfile.id)
84
84
        r.object_store.add_object(t)
85
 
        r.do_commit("pristine tar delta for foo", tree=t.id,
86
 
                    ref='refs/heads/pristine-tar')
87
 
        self.assertEquals(
88
 
            ("some yummy data", "someid"),
 
85
        r.do_commit(b"pristine tar delta for foo", tree=t.id,
 
86
                    ref=b'refs/heads/pristine-tar')
 
87
        self.assertEqual(
 
88
            (b"some yummy data", b"someid"),
89
89
            read_git_pristine_tar_data(r, 'foo'))
90
90
 
91
91
 
95
95
        r = GitMemoryRepo()
96
96
        cid = store_git_pristine_tar_data(r, "foo", "mydelta", "myid")
97
97
        tree = get_pristine_tar_tree(r)
98
 
        self.assertEquals(
99
 
            (stat.S_IFREG | 0644, "7b02de8ac4162e64f402c43487d8a40a505482e1"),
 
98
        self.assertEqual(
 
99
            (stat.S_IFREG | 0o644, "7b02de8ac4162e64f402c43487d8a40a505482e1"),
100
100
            tree["README"])
101
 
        self.assertEquals(r[cid].tree, tree.id)
102
 
        self.assertEquals(r[tree["foo.delta"][1]].data, "mydelta")
103
 
        self.assertEquals(r[tree["foo.id"][1]].data, "myid")
 
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")
104
104
 
105
 
        self.assertEquals(("mydelta", "myid"),
 
105
        self.assertEqual(("mydelta", "myid"),
106
106
            read_git_pristine_tar_data(r, "foo"))