← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_shelf.py

Move all features to bzrlib.tests.features in 2.5

Show diffs side-by-side

added added

removed removed

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