/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 imports of TestLoader on newer versions of bzr.

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,
42
43
    TestCaseWithTransport,
43
44
    )
44
45
 
45
 
from bzrlib.plugins.git import (
46
 
    get_rich_root_format,
47
 
    )
48
46
from bzrlib.plugins.git.fetch import (
49
47
    import_git_blob,
50
48
    import_git_tree,
51
49
    )
52
50
from bzrlib.plugins.git.mapping import (
53
51
    BzrGitMappingv1,
54
 
    default_mapping,
55
 
    )
56
 
from bzrlib.plugins.git.shamap import (
57
 
    DictGitShaMap,
 
52
    DEFAULT_FILE_MODE,
58
53
    )
59
54
from bzrlib.plugins.git.tests import (
60
55
    GitBranchBuilder,
69
64
 
70
65
    def clone_git_repo(self, from_url, to_url, revision_id=None):
71
66
        oldrepos = self.open_git_repo(from_url)
72
 
        dir = BzrDir.create(to_url, get_rich_root_format())
 
67
        dir = BzrDir.create(to_url)
73
68
        newrepos = dir.create_repository()
74
69
        oldrepos.copy_content_into(newrepos, revision_id=revision_id)
75
70
        return newrepos
262
257
        return Repository.open(path)
263
258
 
264
259
 
 
260
class DummyStoreUpdater(object):
 
261
 
 
262
    def add_object(self, obj, ie, path):
 
263
        pass
 
264
 
 
265
    def finish(self):
 
266
        pass
 
267
 
 
268
 
265
269
class ImportObjects(TestCaseWithTransport):
266
270
 
267
271
    def setUp(self):
274
278
        blob = Blob.from_string("bar")
275
279
        base_inv = Inventory()
276
280
        objs = { "blobname": blob}
277
 
        ret, _= import_git_blob(self._texts, self._mapping, "bla", "blobname", 
278
 
            base_inv, None, None, None, "somerevid", [], objs.__getitem__, False,
279
 
            False)
 
281
        ret = import_git_blob(self._texts, self._mapping, "bla", "bla",
 
282
            (None, "blobname"), 
 
283
            base_inv, None, "somerevid", [], objs.__getitem__, 
 
284
            (None, DEFAULT_FILE_MODE), DummyStoreUpdater(),
 
285
            self._mapping.generate_file_id)
280
286
        self.assertEquals(set([('bla', 'somerevid')]), self._texts.keys())
281
287
        self.assertEquals(self._texts.get_record_stream([('bla', 'somerevid')],
282
288
            "unordered", True).next().get_bytes_as("fulltext"), "bar")
292
298
    def test_import_tree_empty_root(self):
293
299
        base_inv = Inventory(root_id=None)
294
300
        tree = Tree()
295
 
        tree.serialize()
296
 
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", 
297
 
               tree.id, base_inv, None, None,
298
 
               None, "somerevid", [], {tree.id: tree}.__getitem__)
 
301
        ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
 
302
               (None, tree.id), base_inv, 
 
303
               None, "somerevid", [], {tree.id: tree}.__getitem__,
 
304
               (None, stat.S_IFDIR), DummyStoreUpdater(),
 
305
               self._mapping.generate_file_id)
 
306
        self.assertEquals(child_modes, {})
299
307
        self.assertEquals(set([("TREE_ROOT", 'somerevid')]), self._texts.keys())
300
308
        self.assertEquals(1, len(ret))
301
309
        self.assertEquals(None, ret[0][0])
310
318
    def test_import_tree_empty(self):
311
319
        base_inv = Inventory()
312
320
        tree = Tree()
313
 
        tree.serialize()
314
 
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", 
315
 
           tree.id, base_inv, None, None, None, "somerevid", [], 
316
 
           { tree.id: tree }.__getitem__)
 
321
        ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
 
322
           (None, tree.id), base_inv, None, "somerevid", [], 
 
323
           { tree.id: tree }.__getitem__,
 
324
           (None, stat.S_IFDIR), DummyStoreUpdater(),
 
325
           self._mapping.generate_file_id)
 
326
        self.assertEquals(child_modes, {})
317
327
        self.assertEquals(set([("bla", 'somerevid')]), self._texts.keys())
318
328
        self.assertEquals(1, len(ret))
319
329
        self.assertEquals(None, ret[0][0])
329
339
        base_inv = Inventory()
330
340
        blob = Blob.from_string("bar1")
331
341
        tree = Tree()
332
 
        tree.add(0100600, "foo", blob.id)
333
 
        tree.serialize()
 
342
        tree.add(stat.S_IFREG | 0644, "foo", blob.id)
334
343
        objects = { blob.id: blob, tree.id: tree }
335
 
        ret, _, _ = import_git_tree(self._texts, self._mapping, "bla", tree.id, 
336
 
            base_inv, None, None, None, "somerevid", [], objects.__getitem__)
 
344
        ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
 
345
                (None, tree.id), base_inv, None, "somerevid", [],
 
346
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
 
347
            self._mapping.generate_file_id)
 
348
        self.assertEquals(child_modes, {})
337
349
        self.assertEquals(2, len(ret))
338
350
        self.assertEquals(None, ret[0][0])
339
351
        self.assertEquals("bla", ret[0][1])
348
360
        self.assertEquals(osutils.sha_strings(["bar1"]), ie.text_sha1)
349
361
        self.assertEquals(False, ie.executable)
350
362
 
 
363
    def test_import_tree_with_unusual_mode_file(self):
 
364
        base_inv = Inventory()
 
365
        blob = Blob.from_string("bar1")
 
366
        tree = Tree()
 
367
        tree.add(stat.S_IFREG | 0664, "foo", blob.id)
 
368
        objects = { blob.id: blob, tree.id: tree }
 
369
        ret, child_modes = import_git_tree(self._texts, self._mapping, "bla", "bla",
 
370
                (None, tree.id), base_inv, None, "somerevid", [],
 
371
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
 
372
            self._mapping.generate_file_id)
 
373
        self.assertEquals(child_modes, { "bla/foo": stat.S_IFREG | 0664 })
 
374
 
351
375
    def test_import_tree_with_file_exe(self):
352
376
        base_inv = Inventory(root_id=None)
353
377
        blob = Blob.from_string("bar")
354
378
        tree = Tree()
355
379
        tree.add(0100755, "foo", blob.id)
356
 
        tree.serialize()
357
380
        objects = { blob.id: blob, tree.id: tree }
358
 
        ret, _, _ = import_git_tree(self._texts, self._mapping, "", tree.id, 
359
 
            base_inv, None, None, None, "somerevid", [], objects.__getitem__)
 
381
        ret, child_modes = import_git_tree(self._texts, self._mapping, "", "",
 
382
                (None, tree.id), base_inv, None, "somerevid", [],
 
383
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
 
384
            self._mapping.generate_file_id)
 
385
        self.assertEquals(child_modes, {})
360
386
        self.assertEquals(2, len(ret))
361
387
        self.assertEquals(None, ret[0][0])
362
388
        self.assertEquals("", ret[0][1])