← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interrepository/test_fetch.py

  • Committer: Patch Queue Manager
  • Date: 2012-06-18 12:59:19 UTC
  • mfrom: (6524.1.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20120618125919-jf2dy5p1apoljtan
(jelmer) Merge 2.5. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interrepository/test_fetch.py
179
179
    def test_fetch_parent_inventories_at_stacking_boundary_smart_old(self):
180
180
        self.setup_smart_server_with_call_log()
181
181
        self.disable_verb('Repository.insert_stream_1.19')
182
 
        self.test_fetch_parent_inventories_at_stacking_boundary()
 
182
        try:
 
183
            self.test_fetch_parent_inventories_at_stacking_boundary()
 
184
        except errors.ConnectionReset:
 
185
            self.knownFailure("Random spurious failure, see bug 874153")
183
186
 
184
187
    def test_fetch_parent_inventories_at_stacking_boundary(self):
185
188
        """Fetch to a stacked branch copies inventories for parents of