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

Fix tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_fetch.py
190
190
        blob = Blob.from_string("bar")
191
191
        base_inv = Inventory()
192
192
        objs = { "blobname": blob}
193
 
        ret = import_git_blob(self._texts, self._mapping, "bla", "blobname", 
 
193
        ret, _= import_git_blob(self._texts, self._mapping, "bla", "blobname", 
194
194
            base_inv, None, "somerevid", [], self._map, objs.__getitem__, False,
195
195
            False)
196
196
        self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
209
209
        base_inv = Inventory(root_id=None)
210
210
        tree = Tree()
211
211
        tree.serialize()
212
 
        ret, _ = import_git_tree(self._texts, self._mapping, "", 
 
212
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", 
213
213
               tree.id, base_inv, 
214
214
               None, "somerevid", [], self._map, {tree.id: tree}.__getitem__)
215
215
        self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
227
227
        base_inv = Inventory()
228
228
        tree = Tree()
229
229
        tree.serialize()
230
 
        ret, _ = import_git_tree(self._texts, self._mapping, "bla", 
 
230
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", 
231
231
           tree.id, base_inv, None, "somerevid", [], 
232
232
           self._map, { tree.id: tree }.__getitem__)
233
233
        self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
248
248
        tree.add(0100600, "foo", blob.id)
249
249
        tree.serialize()
250
250
        objects = { blob.id: blob, tree.id: tree }
251
 
        ret, _ = import_git_tree(self._texts, self._mapping, "bla", tree.id, 
 
251
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", tree.id, 
252
252
            base_inv, None, "somerevid", [], self._map, objects.__getitem__)
253
253
        self.assertEquals(2, len(ret))
254
254
        self.assertEquals(None, ret[0][0])
271
271
        tree.add(0100755, "foo", blob.id)
272
272
        tree.serialize()
273
273
        objects = { blob.id: blob, tree.id: tree }
274
 
        ret, _ = import_git_tree(self._texts, self._mapping, "", tree.id, 
 
274
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", tree.id, 
275
275
            base_inv, None, "somerevid", [], self._map, objects.__getitem__)
276
276
        self.assertEquals(2, len(ret))
277
277
        self.assertEquals(None, ret[0][0])