/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 tests/test_cache.py

Merge changes to avoid inventories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_cache.py
25
25
import os
26
26
import stat
27
27
 
 
28
from bzrlib import osutils
 
29
 
28
30
from bzrlib.inventory import (
29
31
    InventoryFile,
30
32
    InventoryDirectory,
76
78
        updater.finish()
77
79
        self.map.commit_write_group()
78
80
        self.assertEquals(
79
 
            ("commit", ("myrevid",
 
81
            [("commit", ("myrevid",
80
82
                "cc9462f7f8263ef5adfbeff2fb936bb36b504cba",
81
83
                {"testament3-sha1": "cc9462f7f8263ef5adf8eff2fb936bb36b504cba"},
82
 
                )),
83
 
            self.map.lookup_git_sha(c.id))
 
84
                ))],
 
85
            list(self.map.lookup_git_sha(c.id)))
84
86
        self.assertEquals(c.id, self.map.lookup_commit("myrevid"))
85
87
 
86
88
    def test_lookup_notfound(self):
87
 
        self.assertRaises(KeyError,
88
 
            self.map.lookup_git_sha, "5686645d49063c73d35436192dfc9a160c672301")
 
89
        self.assertRaises(KeyError, list,
 
90
            self.map.lookup_git_sha("5686645d49063c73d35436192dfc9a160c672301"))
89
91
 
90
92
    def test_blob(self):
91
93
        self.map.start_write_group()
93
95
        updater.add_object(self._get_test_commit(), { "testament3-sha1": "Test" }, None)
94
96
        b = Blob()
95
97
        b.data = "TEH BLOB"
96
 
        ie = InventoryFile("myfileid", "somename", ROOT_ID)
97
 
        ie.revision = "myrevid"
98
 
        updater.add_object(b, ie, None)
 
98
        updater.add_object(b, ("myfileid", "myrevid"), None)
99
99
        updater.finish()
100
100
        self.map.commit_write_group()
101
101
        self.assertEquals(
102
 
            ("blob", ("myfileid", "myrevid")),
103
 
            self.map.lookup_git_sha(b.id))
 
102
            [("blob", ("myfileid", "myrevid"))],
 
103
            list(self.map.lookup_git_sha(b.id)))
104
104
        self.assertEquals(b.id,
105
105
            self.map.lookup_blob_id("myfileid", "myrevid"))
106
106
 
110
110
        updater.add_object(self._get_test_commit(), {
111
111
            "testament3-sha1": "mytestamentsha" }, None)
112
112
        t = Tree()
113
 
        t.add(stat.S_IFREG, "somename", Blob().id)
114
 
        ie = InventoryDirectory("fileid", "myname", ROOT_ID)
115
 
        ie.revision = "irrelevant"
116
 
        updater.add_object(t, ie, "")
 
113
        t.add("somename", stat.S_IFREG, Blob().id)
 
114
        updater.add_object(t, ("fileid", ), "")
117
115
        updater.finish()
118
116
        self.map.commit_write_group()
119
 
        self.assertEquals(("tree", ("fileid", "myrevid")),
120
 
            self.map.lookup_git_sha(t.id))
 
117
        self.assertEquals([("tree", ("fileid", "myrevid"))],
 
118
            list(self.map.lookup_git_sha(t.id)))
121
119
        # It's possible for a backend to not implement lookup_tree
122
120
        try:
123
121
            self.assertEquals(t.id,
166
164
    def setUp(self):
167
165
        TestCaseInTempDir.setUp(self)
168
166
        try:
169
 
            self.cache = TdbBzrGitCache(os.path.join(self.test_dir, 'foo.tdb'))
 
167
            self.cache = TdbBzrGitCache(
 
168
                os.path.join(self.test_dir, 'foo.tdb').encode(osutils._fs_enc))
170
169
        except ImportError:
171
170
            raise UnavailableFeature("Missing tdb")
172
171
        self.map = self.cache.idmap