Rev 2700: Test setup fix to use get_inventory_weave rather than control_store.get_weave. in http://people.ubuntu.com/~robertc/baz2.0/repository

Robert Collins robertc at robertcollins.net
Fri Aug 3 02:27:06 BST 2007


At http://people.ubuntu.com/~robertc/baz2.0/repository

------------------------------------------------------------
revno: 2700
revision-id: robertc at robertcollins.net-20070803012703-h9q7ixu2azeybfdv
parent: robertc at robertcollins.net-20070803002910-4w0bilw5cgrxvybk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Fri 2007-08-03 11:27:03 +1000
message:
  Test setup fix to use get_inventory_weave rather than control_store.get_weave.
modified:
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
=== modified file 'bzrlib/tests/repository_implementations/test_repository.py'
--- a/bzrlib/tests/repository_implementations/test_repository.py	2007-07-31 07:12:33 +0000
+++ b/bzrlib/tests/repository_implementations/test_repository.py	2007-08-03 01:27:03 +0000
@@ -485,10 +485,19 @@
         self.bzrdir = tree_a.branch.bzrdir
         # add a corrupt inventory 'orphan'
         # this may need some generalising for knits.
-        inv_file = tree_a.branch.repository.control_weaves.get_weave(
-            'inventory', 
-            tree_a.branch.repository.get_transaction())
-        inv_file.add_lines('orphan', [], [])
+        tree_a.lock_write()
+        try:
+            tree_a.branch.repository.start_write_group()
+            inv_file = tree_a.branch.repository.get_inventory_weave()
+            try:
+                inv_file.add_lines('orphan', [], [])
+            except:
+                tree_a.branch.repository.commit_write_group()
+                raise
+            else:
+                tree_a.branch.repository.abort_write_group()
+        finally:
+            tree_a.unlock()
         # add a real revision 'rev1'
         tree_a.commit('rev1', rev_id='rev1', allow_pointless=True)
         # add a real revision 'rev2' based on rev1



More information about the bazaar-commits mailing list