/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 breezy/plugins/git/tests/test_fetch.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-13 00:34:53 UTC
  • mfrom: (7027.3.8 python3-n)
  • Revision ID: breezy.the.bot@gmail.com-20180713003453-3wofrh7brng5jz3l
Add some more bees; support writing both bytes and unicode strings in build_tree_contents.

Merged from https://code.launchpad.net/~jelmer/brz/python3-n/+merge/349091

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/tests/test_fetch.py
341
341
        base_inv = Inventory()
342
342
        objs = { "blobname": blob}
343
343
        ret = import_git_blob(self._texts, self._mapping, b"bla", b"bla",
344
 
            (None, "blobname"), 
345
 
            base_inv, None, b"somerevid", [], objs.__getitem__, 
 
344
            (None, "blobname"),
 
345
            base_inv, None, b"somerevid", [], objs.__getitem__,
346
346
            (None, DEFAULT_FILE_MODE), DummyStoreUpdater(),
347
347
            self._mapping.generate_file_id)
348
348
        self.assertEqual(set([(b'git:bla', b'somerevid')]), self._texts.keys())
349
349
        self.assertEqual(next(self._texts.get_record_stream([(b'git:bla', b'somerevid')],
350
 
            "unordered", True)).get_bytes_as("fulltext"), "bar")
351
 
        self.assertEqual(1, len(ret)) 
 
350
            "unordered", True)).get_bytes_as("fulltext"), b"bar")
 
351
        self.assertEqual(1, len(ret))
352
352
        self.assertEqual(None, ret[0][0])
353
353
        self.assertEqual("bla", ret[0][1])
354
354
        ie = ret[0][3]
355
355
        self.assertEqual(False, ie.executable)
356
356
        self.assertEqual("file", ie.kind)
357
357
        self.assertEqual(b"somerevid", ie.revision)
358
 
        self.assertEqual(osutils.sha_strings(["bar"]), ie.text_sha1)
 
358
        self.assertEqual(osutils.sha_strings([b"bar"]), ie.text_sha1)
359
359
 
360
360
    def test_import_tree_empty_root(self):
361
361
        base_inv = Inventory(root_id=None)
362
362
        tree = Tree()
363
363
        ret, child_modes = import_git_tree(self._texts, self._mapping, b"", b"",
364
 
               (None, tree.id), base_inv, 
 
364
               (None, tree.id), base_inv,
365
365
               None, b"somerevid", [], {tree.id: tree}.__getitem__,
366
366
               (None, stat.S_IFDIR), DummyStoreUpdater(),
367
367
               self._mapping.generate_file_id)
381
381
        base_inv = Inventory()
382
382
        tree = Tree()
383
383
        ret, child_modes = import_git_tree(self._texts, self._mapping, b"bla", b"bla",
384
 
           (None, tree.id), base_inv, None, b"somerevid", [], 
 
384
           (None, tree.id), base_inv, None, b"somerevid", [],
385
385
           { tree.id: tree }.__getitem__,
386
386
           (None, stat.S_IFDIR), DummyStoreUpdater(),
387
387
           self._mapping.generate_file_id)
432
432
            b"bla", b"bla", (None, tree.id), base_inv, None, b"somerevid", [],
433
433
            objects.__getitem__, (None, stat.S_IFDIR), DummyStoreUpdater(),
434
434
            self._mapping.generate_file_id)
435
 
        self.assertEqual(child_modes, { "bla/foo": stat.S_IFREG | 0o664 })
 
435
        self.assertEqual(child_modes, { b"bla/foo": stat.S_IFREG | 0o664 })
436
436
 
437
437
    def test_import_tree_with_file_exe(self):
438
438
        base_inv = Inventory(root_id=None)