/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/workingtree_implementations/test_parents.py

  • Committer: John Arbash Meinel
  • Date: 2008-09-10 17:33:01 UTC
  • mfrom: (3698 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3701.
  • Revision ID: john@arbash-meinel.com-20080910173301-niz0pw3mcat430o1
Merge in bzr.dev 3698

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_parents.py
337
337
        # the delta.
338
338
        result_basis = tree.basis_tree()
339
339
        result_basis.lock_read()
340
 
        self.addCleanup(result_basis.unlock)
341
 
        self.assertEqual(expected_inventory, result_basis.inventory)
 
340
        try:
 
341
            self.assertEqual(expected_inventory, result_basis.inventory)
 
342
        finally:
 
343
            result_basis.unlock()
342
344
 
343
345
    def make_inv_delta(self, old, new):
344
346
        """Make an inventory delta from two inventories."""