/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/tests/test_shelf.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-17 23:40:50 UTC
  • mto: (7045.3.3 python3-r)
  • mto: This revision was merged to the branch mainline in revision 7050.
  • Revision ID: jelmer@jelmer.uk-20180717234050-d8ov7a8e6dotrj07
Fix per_pack_repository tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_shelf.py
376
376
    def check_shelve_deletion(self, tree):
377
377
        self.assertTrue(tree.has_id(b'foo-id'))
378
378
        self.assertTrue(tree.has_id(b'bar-id'))
379
 
        self.assertFileEqual('baz', 'tree/foo/bar')
 
379
        self.assertFileEqual(b'baz', 'tree/foo/bar')
380
380
 
381
381
    def test_shelve_deletion(self):
382
382
        creator, tree = self.prepare_shelve_deletion()
424
424
        return creator
425
425
 
426
426
    def check_shelve_change_kind(self, creator):
427
 
        self.assertFileEqual('bar', 'tree/foo')
 
427
        self.assertFileEqual(b'bar', 'tree/foo')
428
428
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
429
429
        self.assertEqual('directory',
430
430
                         creator.shelf_transform._new_contents[s_trans_id])
564
564
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
565
565
            unshelver.make_merger().do_merge()
566
566
            self.addCleanup(unshelver.finalize)
567
 
            self.assertFileEqual('bar', 'tree/foo')
 
567
            self.assertFileEqual(b'bar', 'tree/foo')
568
568
 
569
569
    def test_unshelve_changed(self):
570
570
        tree = self.make_branch_and_tree('tree')
577
577
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
578
578
        self.addCleanup(creator.finalize)
579
579
        list(creator.iter_shelvable())
580
 
        creator.shelve_lines(b'foo-id', ['a\n', 'b\n', 'c\n'])
 
580
        creator.shelve_lines(b'foo-id', [b'a\n', b'b\n', b'c\n'])
581
581
        shelf_file = open('shelf', 'w+b')
582
582
        self.addCleanup(shelf_file.close)
583
583
        creator.write_shelf(shelf_file)
587
587
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
588
588
        self.addCleanup(unshelver.finalize)
589
589
        unshelver.make_merger().do_merge()
590
 
        self.assertFileEqual('z\na\nb\nd\n', 'tree/foo')
 
590
        self.assertFileEqual(b'z\na\nb\nd\n', 'tree/foo')
591
591
 
592
592
    def test_unshelve_deleted(self):
593
593
        tree = self.make_branch_and_tree('tree')
610
610
        # validate the test setup
611
611
        self.assertTrue(tree.has_id(b'foo-id'))
612
612
        self.assertTrue(tree.has_id(b'bar-id'))
613
 
        self.assertFileEqual('baz', 'tree/foo/bar')
 
613
        self.assertFileEqual(b'baz', 'tree/foo/bar')
614
614
        with open('shelf', 'r+b') as shelf_file:
615
615
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
616
616
            self.addCleanup(unshelver.finalize)
772
772
        tree.lock_write()
773
773
        self.addCleanup(tree.unlock)
774
774
        self.build_tree_contents([('tree/foo', b'bar')])
775
 
        self.assertFileEqual('bar', 'tree/foo')
 
775
        self.assertFileEqual(b'bar', 'tree/foo')
776
776
        tree.add('foo', b'foo-id')
777
777
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
778
778
        self.addCleanup(creator.finalize)
784
784
        unshelver = shelf_manager.get_unshelver(shelf_id)
785
785
        self.addCleanup(unshelver.finalize)
786
786
        unshelver.make_merger().do_merge()
787
 
        self.assertFileEqual('bar', 'tree/foo')
 
787
        self.assertFileEqual(b'bar', 'tree/foo')
788
788
 
789
789
    def test_get_metadata(self):
790
790
        tree = self.make_branch_and_tree('.')