~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-09 20:33:43 UTC
  • mto: (5029.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5030.
  • Revision ID: v.ladeuil+lp@free.fr-20100209203343-ktxx7t0xvptvjnt1
Move TestingPathFilteringServer to bzrlib.tests.test_server

Show diffs side-by-side

added added

removed removed

Lines of Context:
484
484
        other_bzrdir = master_branch.bzrdir.sprout('other')
485
485
        other_tree = other_bzrdir.open_workingtree()
486
486
 
487
 
        # do a commit to the the other branch changing the content file so
 
487
        # do a commit to the other branch changing the content file so
488
488
        # that our commit after merging will have a merged revision in the
489
489
        # content file history.
490
490
        self.build_tree_contents([('other/content_file', 'change in other\n')])
708
708
        cb = self.Callback(u'commit 2', self)
709
709
        repository = tree.branch.repository
710
710
        # simulate network failure
711
 
        def raise_(self, arg, arg2):
 
711
        def raise_(self, arg, arg2, arg3=None, arg4=None):
712
712
            raise errors.NoSuchFile('foo')
713
713
        repository.add_inventory = raise_
 
714
        repository.add_inventory_by_delta = raise_
714
715
        self.assertRaises(errors.NoSuchFile, tree.commit, message_callback=cb)
715
716
        self.assertFalse(cb.called)
716
717