/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, split up InterGitNonGitRepository.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_fetch.py
189
189
    def test_import_blob_simple(self):
190
190
        blob = Blob.from_string("bar")
191
191
        base_inv = Inventory()
192
 
        ret = import_git_blob(self._texts, self._mapping, "bla", blob, 
193
 
            base_inv, None, "somerevid", [], self._map, False)
 
192
        objs = { "blobname": blob}
 
193
        ret = import_git_blob(self._texts, self._mapping, "bla", "blobname", 
 
194
            base_inv, None, "somerevid", [], self._map, objs.__getitem__, False)
194
195
        self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
195
196
        self.assertEquals(self._texts.get_record_stream([('bla', 'somerevid')],
196
197
            "unordered", True).next().get_bytes_as("fulltext"), "bar")
207
208
        base_inv = Inventory(root_id=None)
208
209
        tree = Tree()
209
210
        tree.serialize()
210
 
        ret = import_git_tree(self._texts, self._mapping, "", tree, base_inv, 
211
 
            None, "somerevid", [], self._map, {}.__getitem__)
 
211
        ret = import_git_tree(self._texts, self._mapping, "", 
 
212
               tree.id, base_inv, 
 
213
               None, "somerevid", [], self._map, {tree.id: tree}.__getitem__)
212
214
        self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
213
215
        self.assertEquals(1, len(ret))
214
216
        self.assertEquals(None, ret[0][0])
224
226
        base_inv = Inventory()
225
227
        tree = Tree()
226
228
        tree.serialize()
227
 
        ret = import_git_tree(self._texts, self._mapping, "bla", tree, 
228
 
            base_inv, None, "somerevid", [], self._map, {}.__getitem__)
 
229
        ret = import_git_tree(self._texts, self._mapping, "bla", 
 
230
           tree.id, base_inv, None, "somerevid", [], 
 
231
           self._map, { tree.id: tree }.__getitem__)
229
232
        self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
230
233
        self.assertEquals(1, len(ret))
231
234
        self.assertEquals(None, ret[0][0])
244
247
        tree.add(0100600, "foo", blob.id)
245
248
        tree.serialize()
246
249
        objects = { blob.id: blob, tree.id: tree }
247
 
        ret = import_git_tree(self._texts, self._mapping, "bla", tree, 
 
250
        ret = import_git_tree(self._texts, self._mapping, "bla", tree.id, 
248
251
            base_inv, None, "somerevid", [], self._map, objects.__getitem__)
249
252
        self.assertEquals(2, len(ret))
250
253
        self.assertEquals(None, ret[0][0])
267
270
        tree.add(0100755, "foo", blob.id)
268
271
        tree.serialize()
269
272
        objects = { blob.id: blob, tree.id: tree }
270
 
        ret = import_git_tree(self._texts, self._mapping, "", tree, 
 
273
        ret = import_git_tree(self._texts, self._mapping, "", tree.id, 
271
274
            base_inv, None, "somerevid", [], self._map, objects.__getitem__)
272
275
        self.assertEquals(2, len(ret))
273
276
        self.assertEquals(None, ret[0][0])