Rev 4626: Merge fix for test_commit with/2a default. in http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

------------------------------------------------------------
revno: 4626 [merge]
revision-id: robertc at robertcollins.net-20090817040045-pg2axbdvgzudu48d
parent: robertc at robertcollins.net-20090817035144-3tf1hviucss2mki0
parent: robertc at robertcollins.net-20090817035818-8rw8j22rvxc0nxx0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-398668
timestamp: Mon 2009-08-17 14:00:45 +1000
message:
  Merge fix for test_commit with/2a default.
modified:
  bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
=== modified file 'bzrlib/tests/test_commit.py'
--- a/bzrlib/tests/test_commit.py	2009-06-10 03:56:49 +0000
+++ b/bzrlib/tests/test_commit.py	2009-08-17 03:58:18 +0000
@@ -708,9 +708,10 @@
         cb = self.Callback(u'commit 2', self)
         repository = tree.branch.repository
         # simulate network failure
-        def raise_(self, arg, arg2):
+        def raise_(self, arg, arg2, arg3=None, arg4=None):
             raise errors.NoSuchFile('foo')
         repository.add_inventory = raise_
+        repository.add_inventory_by_delta = raise_
         self.assertRaises(errors.NoSuchFile, tree.commit, message_callback=cb)
         self.assertFalse(cb.called)