Rev 2729: Fix some more pack-related test breakage. in http://people.ubuntu.com/~robertc/baz2.0/repository
Robert Collins
robertc at robertcollins.net
Fri Aug 24 00:41:34 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/repository
------------------------------------------------------------
revno: 2729
revision-id: robertc at robertcollins.net-20070823234132-88vlkdspikrnvdl8
parent: robertc at robertcollins.net-20070823231559-0rkddo1v7ck75yya
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Fri 2007-08-24 09:41:32 +1000
message:
Fix some more pack-related test breakage.
modified:
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
=== modified file 'bzrlib/tests/interrepository_implementations/test_interrepository.py'
--- a/bzrlib/tests/interrepository_implementations/test_interrepository.py 2007-08-22 01:02:35 +0000
+++ b/bzrlib/tests/interrepository_implementations/test_interrepository.py 2007-08-23 23:41:32 +0000
@@ -297,6 +297,8 @@
inv = Inventory(revision_id='ghost')
inv.root.revision = 'ghost'
repo = self.make_repository('with_ghost_rev')
+ repo.lock_write()
+ repo.start_write_group()
sha1 = repo.add_inventory('ghost', inv, [])
rev = bzrlib.revision.Revision(timestamp=0,
timezone=None,
@@ -306,10 +308,14 @@
revision_id='ghost')
rev.parent_ids = []
repo.add_revision('ghost', rev)
+ repo.commit_write_group()
+ repo.unlock()
repo = self.make_to_repository('missing_ghost')
inv = Inventory(revision_id='with_ghost')
inv.root.revision = 'with_ghost'
+ repo.lock_write()
+ repo.start_write_group()
sha1 = repo.add_inventory('with_ghost', inv, [])
rev = bzrlib.revision.Revision(timestamp=0,
timezone=None,
@@ -319,6 +325,8 @@
revision_id='with_ghost')
rev.parent_ids = ['ghost']
repo.add_revision('with_ghost', rev)
+ repo.commit_write_group()
+ repo.unlock()
def test_fetch_all_fixes_up_ghost(self):
# fetching from a repo with a current ghost unghosts it in referencing
=== modified file 'bzrlib/tests/repository_implementations/test_fetch.py'
--- a/bzrlib/tests/repository_implementations/test_fetch.py 2007-08-22 01:02:35 +0000
+++ b/bzrlib/tests/repository_implementations/test_fetch.py 2007-08-23 23:41:32 +0000
@@ -87,7 +87,7 @@
repo = wt.branch.repository
repo.lock_write()
repo.start_write_group()
- repo.sign_revision('rev1', bzrlib.gpg.LoopbackGPGStrategy(None))
+ repo.sign_revision('rev1', gpg.LoopbackGPGStrategy(None))
repo.commit_write_group()
repo.unlock()
return repo
More information about the bazaar-commits
mailing list