/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_status.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-11 07:14:58 UTC
  • mto: (4350.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4354.
  • Revision ID: v.ladeuil+lp@free.fr-20090511071458-bjghkrcdxbv87193
Fix 2 more lock-related test failures.

* tests/test_lockable_files.py:
Replace some try/finally with an addCleanup().
(_TestLockableFiles_mixin.test_leave_in_place): Restore clearing
lock behavior.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_status.py
53
53
        tree2.commit('commit 3b', timestamp=1196796819, timezone=0)
54
54
        tree3.commit('commit 3c', timestamp=1196796819, timezone=0)
55
55
        tree.merge_from_branch(tree2.branch)
56
 
        tree.merge_from_branch(tree3.branch, force=True)
 
56
        tree.merge_from_branch(tree3.branch)
57
57
        return tree
58
58
 
59
59
    def test_multiple_pending(self):