Rev 3018: test_merge_core locking correctness. in http://people.ubuntu.com/~robertc/baz2.0/pack.read-locks

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/pack.read-locks

------------------------------------------------------------
revno: 3018
revision-id:robertc at robertcollins.net-20071121235702-y3gnrt33q6ng81mz
parent: robertc at robertcollins.net-20071121234250-hnltm60sryng2w55
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pack.read-locks
timestamp: Thu 2007-11-22 10:57:02 +1100
message:
  test_merge_core locking correctness.
modified:
  bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
=== modified file 'bzrlib/tests/test_merge_core.py'
--- a/bzrlib/tests/test_merge_core.py	2007-08-29 16:09:51 +0000
+++ b/bzrlib/tests/test_merge_core.py	2007-11-21 23:57:02 +0000
@@ -725,6 +725,8 @@
         this, other = self.set_up_trees()
         self.assertRaises(errors.RevisionNotPresent, Merger.from_revision_ids,
                           progress.DummyProgress(), this, 'rev2b')
+        this.lock_write()
+        self.addCleanup(this.unlock)
         merger = Merger.from_revision_ids(progress.DummyProgress(), this,
             'rev2b', other_branch=other.branch)
         self.assertEqual('rev2b', merger.other_rev_id)
@@ -743,8 +745,12 @@
     def test_from_mergeable(self):
         this, other = self.set_up_trees()
         other.commit('rev3', rev_id='rev3')
+        this.lock_write()
+        self.addCleanup(this.unlock)
         md = merge_directive.MergeDirective2.from_objects(
             other.branch.repository, 'rev3', 0, 0, 'this')
+        other.lock_read()
+        self.addCleanup(other.unlock)
         merger, verified = Merger.from_mergeable(this, md,
             progress.DummyProgress())
         md.patch = None