/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: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_shelf.py
381
381
        return creator, tree
382
382
 
383
383
    def check_shelve_deletion(self, tree):
384
 
        self.assertEqual(tree.id2path(b'foo-id'), 'foo')
385
 
        self.assertEqual(tree.id2path(b'bar-id'), 'foo/bar')
 
384
        self.assertTrue(tree.has_id(b'foo-id'))
 
385
        self.assertTrue(tree.has_id(b'bar-id'))
386
386
        self.assertFileEqual(b'baz', 'tree/foo/bar')
387
387
 
388
388
    def test_shelve_deletion(self):
611
611
            creator.transform()
612
612
            creator.finalize()
613
613
        # validate the test setup
614
 
        self.assertEqual(tree.id2path(b'foo-id'), 'foo')
615
 
        self.assertEqual(tree.id2path(b'bar-id'), 'foo/bar')
 
614
        self.assertTrue(tree.has_id(b'foo-id'))
 
615
        self.assertTrue(tree.has_id(b'bar-id'))
616
616
        self.assertFileEqual(b'baz', 'tree/foo/bar')
617
617
        with open('shelf', 'r+b') as shelf_file:
618
618
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
619
619
            self.addCleanup(unshelver.finalize)
620
620
            unshelver.make_merger().do_merge()
621
 
        self.assertRaises(errors.NoSuchId, tree.id2path, b'foo-id')
622
 
        self.assertRaises(errors.NoSuchId, tree.id2path, b'bar-id')
 
621
        self.assertFalse(tree.has_id(b'foo-id'))
 
622
        self.assertFalse(tree.has_id(b'bar-id'))
623
623
 
624
624
    def test_unshelve_base(self):
625
625
        tree = self.make_branch_and_tree('tree')