/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 some more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_fetch.py
23
23
    Repo as GitRepo,
24
24
    )
25
25
import os
 
26
import stat
26
27
 
27
28
from bzrlib import (
28
29
    knit,
41
42
from bzrlib.tests import (
42
43
    TestCaseWithTransport,
43
44
    )
44
 
from bzrlib.transport import (
45
 
    get_transport,
46
 
    )
47
45
 
48
46
from bzrlib.plugins.git import (
49
47
    get_rich_root_format,
54
52
    )
55
53
from bzrlib.plugins.git.mapping import (
56
54
    BzrGitMappingv1,
57
 
    default_mapping,
58
 
    )
59
 
from bzrlib.plugins.git.shamap import (
60
 
    DictGitShaMap,
 
55
    DEFAULT_FILE_MODE,
61
56
    )
62
57
from bzrlib.plugins.git.tests import (
63
58
    GitBranchBuilder,
265
260
        return Repository.open(path)
266
261
 
267
262
 
 
263
class DummyStoreUpdater(object):
 
264
 
 
265
    def add_object(self, obj, ie):
 
266
        pass
 
267
 
 
268
    def finish(self):
 
269
        pass
 
270
 
 
271
 
268
272
class ImportObjects(TestCaseWithTransport):
269
273
 
270
274
    def setUp(self):
271
275
        super(ImportObjects, self).setUp()
272
 
        self._map = DictGitShaMap()
273
276
        self._mapping = BzrGitMappingv1()
274
277
        factory = knit.make_file_factory(True, versionedfile.PrefixMapper())
275
278
        self._texts = factory(self.get_transport('texts'))
278
281
        blob = Blob.from_string("bar")
279
282
        base_inv = Inventory()
280
283
        objs = { "blobname": blob}
281
 
        ret, _= import_git_blob(self._texts, self._mapping, "bla", "blobname", 
282
 
            base_inv, None, "somerevid", [], self._map, objs.__getitem__, False,
283
 
            False)
 
284
        ret = import_git_blob(self._texts, self._mapping, "bla", "bla",
 
285
            (None, "blobname"), 
 
286
            base_inv, None, "somerevid", [], objs.__getitem__, 
 
287
            (None, DEFAULT_FILE_MODE), DummyStoreUpdater(),
 
288
            self._mapping.generate_file_id)
284
289
        self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
285
290
        self.assertEquals(self._texts.get_record_stream([('bla', 'somerevid')],
286
291
            "unordered", True).next().get_bytes_as("fulltext"), "bar")
296
301
    def test_import_tree_empty_root(self):
297
302
        base_inv = Inventory(root_id=None)
298
303
        tree = Tree()
299
 
        tree.serialize()
300
 
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", 
301
 
               tree.id, base_inv, 
302
 
               None, "somerevid", [], self._map, {tree.id: tree}.__getitem__)
 
304
        ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
 
305
               (None, tree.id), base_inv, 
 
306
               None, "somerevid", [], {tree.id: tree}.__getitem__,
 
307
               (None, stat.S_IFDIR), DummyStoreUpdater(),
 
308
               self._mapping.generate_file_id)
 
309
        self.assertEquals(child_modes, {})
303
310
        self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
304
311
        self.assertEquals(1, len(ret))
305
312
        self.assertEquals(None, ret[0][0])
314
321
    def test_import_tree_empty(self):
315
322
        base_inv = Inventory()
316
323
        tree = Tree()
317
 
        tree.serialize()
318
 
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", 
319
 
           tree.id, base_inv, None, "somerevid", [], 
320
 
           self._map, { tree.id: tree }.__getitem__)
 
324
        ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
 
325
           (None, tree.id), base_inv, None, "somerevid", [], 
 
326
           { tree.id: tree }.__getitem__,
 
327
           (None, stat.S_IFDIR), DummyStoreUpdater(),
 
328
           self._mapping.generate_file_id)
 
329
        self.assertEquals(child_modes, {})
321
330
        self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
322
331
        self.assertEquals(1, len(ret))
323
332
        self.assertEquals(None, ret[0][0])
333
342
        base_inv = Inventory()
334
343
        blob = Blob.from_string("bar1")
335
344
        tree = Tree()
336
 
        tree.add(0100600, "foo", blob.id)
337
 
        tree.serialize()
 
345
        tree.add(stat.S_IFREG | 0644, "foo", blob.id)
338
346
        objects = { blob.id: blob, tree.id: tree }
339
 
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", tree.id, 
340
 
            base_inv, None, "somerevid", [], self._map, objects.__getitem__)
 
347
        ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
 
348
                (None, tree.id), base_inv, None, "somerevid", [],
 
349
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
 
350
            self._mapping.generate_file_id)
 
351
        self.assertEquals(child_modes, {})
341
352
        self.assertEquals(2, len(ret))
342
353
        self.assertEquals(None, ret[0][0])
343
354
        self.assertEquals("bla", ret[0][1])
352
363
        self.assertEquals(osutils.sha_strings(["bar1"]), ie.text_sha1)
353
364
        self.assertEquals(False, ie.executable)
354
365
 
 
366
    def test_import_tree_with_unusual_mode_file(self):
 
367
        base_inv = Inventory()
 
368
        blob = Blob.from_string("bar1")
 
369
        tree = Tree()
 
370
        tree.add(stat.S_IFREG | 0664, "foo", blob.id)
 
371
        objects = { blob.id: blob, tree.id: tree }
 
372
        ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
 
373
                (None, tree.id), base_inv, None, "somerevid", [],
 
374
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
 
375
            self._mapping.generate_file_id)
 
376
        self.assertEquals(child_modes, { "bla/foo": stat.S_IFREG | 0664 })
 
377
 
355
378
    def test_import_tree_with_file_exe(self):
356
379
        base_inv = Inventory(root_id=None)
357
380
        blob = Blob.from_string("bar")
358
381
        tree = Tree()
359
382
        tree.add(0100755, "foo", blob.id)
360
 
        tree.serialize()
361
383
        objects = { blob.id: blob, tree.id: tree }
362
 
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", tree.id, 
363
 
            base_inv, None, "somerevid", [], self._map, objects.__getitem__)
 
384
        ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
 
385
                (None, tree.id), base_inv, None, "somerevid", [],
 
386
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
 
387
            self._mapping.generate_file_id)
 
388
        self.assertEquals(child_modes, {})
364
389
        self.assertEquals(2, len(ret))
365
390
        self.assertEquals(None, ret[0][0])
366
391
        self.assertEquals("", ret[0][1])