Rev 3014: Make the knit specific fetch tests knit specific, and lock the branch when looking at historical texts in test_fetch. 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: 3014
revision-id:robertc at robertcollins.net-20071121233532-6pr4b7vvq3s01b7m
parent: robertc at robertcollins.net-20071121221702-winh9l8xzqt177px
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pack.read-locks
timestamp: Thu 2007-11-22 10:35:32 +1100
message:
  Make the knit specific fetch tests knit specific, and lock the branch when looking at historical texts in test_fetch.
modified:
  bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
=== modified file 'bzrlib/tests/test_fetch.py'
--- a/bzrlib/tests/test_fetch.py	2007-10-16 16:02:01 +0000
+++ b/bzrlib/tests/test_fetch.py	2007-11-21 23:35:32 +0000
@@ -231,6 +231,8 @@
         br2 = Branch.open('br2')
         br1 = Branch.open('br1')
         wt2 = WorkingTree.open('br2').merge_from_branch(br1)
+        br2.lock_read()
+        self.addCleanup(br2.unlock)
         for rev_id, text in [('1-2', 'original from 1\n'),
                              ('1-3', 'agreement\n'),
                              ('2-1', 'contents in 2\n'),
@@ -264,7 +266,8 @@
 
     def test_weaves_are_retrieved_once(self):
         self.build_tree(("source/", "source/file", "target/"))
-        wt = self.make_branch_and_tree('source')
+        # This test depends on knit dasta storage.
+        wt = self.make_branch_and_tree('source', format='dirstate-tags')
         branch = wt.branch
         wt.add(["file"], ["id"])
         wt.commit("added file")