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

  • Committer: Vincent Ladeuil
  • Date: 2011-07-06 09:22:00 UTC
  • mfrom: (6008 +trunk)
  • mto: (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110706092200-7iai2mwzc0sqdsvf
Merging in trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf.py
330
330
        return creator, tree
331
331
 
332
332
    def check_shelve_deletion(self, tree):
333
 
        self.assertTrue('foo-id' in tree)
334
 
        self.assertTrue('bar-id' in tree)
 
333
        self.assertTrue(tree.has_id('foo-id'))
 
334
        self.assertTrue(tree.has_id('bar-id'))
335
335
        self.assertFileEqual('baz', 'tree/foo/bar')
336
336
 
337
337
    def test_shelve_deletion(self):
568
568
        list(creator.iter_shelvable())
569
569
        creator.shelve_deletion('foo-id')
570
570
        creator.shelve_deletion('bar-id')
571
 
        shelf_file = open('shelf', 'w+b')
572
 
        self.addCleanup(shelf_file.close)
573
 
        creator.write_shelf(shelf_file)
574
 
        creator.transform()
575
 
        creator.finalize()
 
571
        with open('shelf', 'w+b') as shelf_file:
 
572
            creator.write_shelf(shelf_file)
 
573
            creator.transform()
 
574
            creator.finalize()
576
575
        # validate the test setup
577
 
        self.assertTrue('foo-id' in tree)
578
 
        self.assertTrue('bar-id' in tree)
 
576
        self.assertTrue(tree.has_id('foo-id'))
 
577
        self.assertTrue(tree.has_id('bar-id'))
579
578
        self.assertFileEqual('baz', 'tree/foo/bar')
580
 
        shelf_file.seek(0)
581
 
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
582
 
        self.addCleanup(unshelver.finalize)
583
 
        unshelver.make_merger().do_merge()
584
 
        self.assertFalse('foo-id' in tree)
585
 
        self.assertFalse('bar-id' in tree)
 
579
        with open('shelf', 'r+b') as shelf_file:
 
580
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
 
581
            self.addCleanup(unshelver.finalize)
 
582
            unshelver.make_merger().do_merge()
 
583
        self.assertFalse(tree.has_id('foo-id'))
 
584
        self.assertFalse(tree.has_id('bar-id'))
586
585
 
587
586
    def test_unshelve_base(self):
588
587
        tree = self.make_branch_and_tree('tree')